X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fswig%2Fclasses.i;h=443d77b5e78578c82555303d689a1d80622c6eaa;hb=5faebab2903dc91949edc31f0a4b118d86090a30;hp=2212d9b3e7dceca6e04817e6eead97b40b32eacd;hpb=b20635771c249f9548af414f21a92b296e284475;p=libsigrok.git

diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i
index 2212d9b3..443d77b5 100644
--- a/bindings/swig/classes.i
+++ b/bindings/swig/classes.i
@@ -20,7 +20,7 @@
 #pragma SWIG nowarn=325,401
 
 %{
-#include "libsigrok/libsigrok.hpp"
+#include <libsigrokcxx/libsigrokcxx.hpp>
 using namespace std;
 %}
 
@@ -66,14 +66,13 @@ template< class T > class enable_shared_from_this;
 %shared_ptr(sigrok::HardwareDevice);
 %shared_ptr(sigrok::Channel);
 %shared_ptr(sigrok::ChannelGroup);
-%shared_ptr(sigrok::EventSource);
 %shared_ptr(sigrok::Session);
 %shared_ptr(sigrok::SessionDevice);
 %shared_ptr(sigrok::Packet);
 %shared_ptr(sigrok::PacketPayload);
 %shared_ptr(sigrok::Header);
 %shared_ptr(sigrok::Meta);
-%shared_ptr(sigrok::Analog);
+%shared_ptr(sigrok::AnalogOld);
 %shared_ptr(sigrok::Logic);
 %shared_ptr(sigrok::InputFormat);
 %shared_ptr(sigrok::Input);
@@ -84,6 +83,7 @@ template< class T > class enable_shared_from_this;
 %shared_ptr(sigrok::Trigger);
 %shared_ptr(sigrok::TriggerStage);
 %shared_ptr(sigrok::TriggerMatch);
+%shared_ptr(sigrok::UserDevice);
 
 %template(StringMap) std::map<std::string, std::string>;
 
@@ -137,7 +137,6 @@ template< class T > class enable_shared_from_this;
 #define SR_PRIV
 
 %ignore sigrok::DatafeedCallbackData;
-%ignore sigrok::SourceCallbackData;
 
 #define SWIG_ATTRIBUTE_TEMPLATE
 
@@ -175,9 +174,6 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
 %attribute(sigrok::Context,
     const sigrok::LogLevel *, log_level, log_level, set_log_level);
 
-%attributestring(sigrok::Context,
-    std::string, log_domain, log_domain, set_log_domain);
-
 %attributestring(sigrok::Driver, std::string, name, name);
 %attributestring(sigrok::Driver, std::string, long_name, long_name);
 
@@ -263,17 +259,17 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
 
 %attributemap(Meta, map_ConfigKey_Variant, config, config);
 
-%attributevector(Analog,
+%attributevector(AnalogOld,
     std::vector<std::shared_ptr<sigrok::Channel> >, channels, channels);
-%attribute(sigrok::Analog, int, num_samples, num_samples);
-%attribute(sigrok::Analog, const sigrok::Quantity *, mq, mq);
-%attribute(sigrok::Analog, const sigrok::Unit *, unit, unit);
-%attributevector(Analog, std::vector<const sigrok::QuantityFlag *>, mq_flags, mq_flags);
+%attribute(sigrok::AnalogOld, int, num_samples, num_samples);
+%attribute(sigrok::AnalogOld, const sigrok::Quantity *, mq, mq);
+%attribute(sigrok::AnalogOld, const sigrok::Unit *, unit, unit);
+%attributevector(AnalogOld, std::vector<const sigrok::QuantityFlag *>, mq_flags, mq_flags);
 
-%include "libsigrok/libsigrok.hpp"
+%include <libsigrokcxx/libsigrokcxx.hpp>
 
-%include "enums.i"
+%include "swig/enums.i"
 
 namespace sigrok {
-%include "libsigrok/enums.hpp"
+%include <libsigrokcxx/enums.hpp>
 }