X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fswig%2Fclasses.i;h=b87bbe1b06a33c3566c19e62a188fcb45078536c;hb=d0fa4ac1e786490b47b9f4284ad045f65d1e058d;hp=253ce01b4b770dcaee17fbcbb6a7fbaebe41b850;hpb=f36ca8893d575d42eae0b103768ac7d8a4320322;p=libsigrok.git

diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i
index 253ce01b..b87bbe1b 100644
--- a/bindings/swig/classes.i
+++ b/bindings/swig/classes.i
@@ -19,16 +19,7 @@
 
 #pragma SWIG nowarn=325,401
 
-%{
-#include "libsigrok/libsigrok.hpp"
-using namespace std;
-%}
-
 %include "typemaps.i"
-%include "std_string.i"
-%include "std_vector.i"
-%include "std_map.i"
-%include "std_shared_ptr.i"
 %include "exception.i"
 
 %{
@@ -66,8 +57,8 @@ 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);
@@ -75,62 +66,22 @@ template< class T > class enable_shared_from_this;
 %shared_ptr(sigrok::Analog);
 %shared_ptr(sigrok::Logic);
 %shared_ptr(sigrok::InputFormat);
-%shared_ptr(sigrok::InputFileDevice);
+%shared_ptr(sigrok::Input);
+%shared_ptr(sigrok::InputDevice);
+%shared_ptr(sigrok::Option);
 %shared_ptr(sigrok::OutputFormat);
 %shared_ptr(sigrok::Output);
 %shared_ptr(sigrok::Trigger);
 %shared_ptr(sigrok::TriggerStage);
 %shared_ptr(sigrok::TriggerMatch);
-
-%template(StringMap) std::map<std::string, std::string>;
-
-%template(DriverMap)
-    std::map<std::string, std::shared_ptr<sigrok::Driver> >;
-%template(InputFormatMap)
-    std::map<std::string, std::shared_ptr<sigrok::InputFormat> >;
-%template(OutputFormatMap)
-    std::map<std::string, std::shared_ptr<sigrok::OutputFormat> >;
-
-%template(HardwareDeviceVector)
-    std::vector<std::shared_ptr<sigrok::HardwareDevice> >;
-
-%template(DeviceVector)
-    std::vector<std::shared_ptr<sigrok::Device> >;
-
-%template(ChannelVector)
-    std::vector<std::shared_ptr<sigrok::Channel> >;
-
-%template(ChannelGroupMap)
-    std::map<std::string, std::shared_ptr<sigrok::ChannelGroup> >;
-
-/* Workaround for SWIG bug. The vector template instantiation
-   isn't needed but somehow fixes a bug that stops the wrapper
-   for the map instantiation from compiling. */
-%template(ConfigVector)
-    std::vector<const sigrok::ConfigKey *>;
-%template(ConfigMap)
-    std::map<const sigrok::ConfigKey *, Glib::VariantBase>;
-
-%template(QuantityFlagVector)
-    std::vector<const sigrok::QuantityFlag *>;
-
-%template(TriggerStageVector)
- std::vector<std::shared_ptr<sigrok::TriggerStage> >;
-
-%template(TriggerMatchVector)
- std::vector<std::shared_ptr<sigrok::TriggerMatch> >;
+%shared_ptr(sigrok::UserDevice);
 
 #define SR_API
 #define SR_PRIV
 
 %ignore sigrok::DatafeedCallbackData;
-%ignore sigrok::SourceCallbackData;
 
-%include "libsigrok/libsigrok.hpp"
-
-namespace sigrok {
-%include "libsigrok/enums.hpp"
-}
+#ifndef SWIGJAVA
 
 #define SWIG_ATTRIBUTE_TEMPLATE
 
@@ -145,95 +96,127 @@ typedef std::map<std::string, std::shared_ptr<sigrok::OutputFormat> >
     map_string_OutputFormat;
 typedef std::map<std::string, std::shared_ptr<sigrok::ChannelGroup> >
     map_string_ChannelGroup;
+typedef std::map<std::string, std::shared_ptr<sigrok::Option> >
+    map_string_Option;
+typedef std::map<std::string, Glib::VariantBase>
+    map_string_Variant;
 typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
     map_ConfigKey_Variant;
 }
 
-%attributeval(sigrok::Context,
-    map_string_Driver, drivers, get_drivers);
-%attributeval(sigrok::Context,
-    map_string_InputFormat, input_formats, get_input_formats);
-%attributeval(sigrok::Context,
-    map_string_OutputFormat, output_formats, get_output_formats);
+%attributemap(Context,
+    map_string_Driver, drivers, drivers);
+%attributemap(Context,
+    map_string_InputFormat, input_formats, input_formats);
+%attributemap(Context,
+    map_string_OutputFormat, output_formats, output_formats);
 
 %attributestring(sigrok::Context,
-    std::string, package_version, get_package_version);
+    std::string, package_version, package_version);
 %attributestring(sigrok::Context,
-    std::string, lib_version, get_lib_version);
+    std::string, lib_version, lib_version);
 
 %attribute(sigrok::Context,
-    const sigrok::LogLevel *, log_level, get_log_level, set_log_level);
+    const sigrok::LogLevel *, log_level, log_level, set_log_level);
 
-%attributestring(sigrok::Context,
-    std::string, log_domain, get_log_domain, set_log_domain);
-
-%attributestring(sigrok::Driver, std::string, name, get_name);
-%attributestring(sigrok::Driver, std::string, long_name, get_long_name);
+%attributestring(sigrok::Driver, std::string, name, name);
+%attributestring(sigrok::Driver, std::string, long_name, long_name);
 
 %attributestring(sigrok::InputFormat,
-    std::string, name, get_name);
+    std::string, name, name);
 %attributestring(sigrok::InputFormat,
-    std::string, description, get_description);
+    std::string, description, description);
+
+%attributestring(sigrok::Input,
+    std::shared_ptr<sigrok::InputDevice>, device, device);
+
+%attributestring(sigrok::Option,
+    std::string, id, id);
+%attributestring(sigrok::Option,
+    std::string, name, name);
+%attributestring(sigrok::Option,
+    std::string, description, description);
+/* Currently broken on Python due to some issue with variant typemaps. */
+/* %attributevector(Option,
+    Glib::VariantBase, default_value, default_value); */
+%attributevector(Option,
+    std::vector<Glib::VariantBase>, values, values);
 
 %attributestring(sigrok::OutputFormat,
-    std::string, name, get_name);
+    std::string, name, name);
 %attributestring(sigrok::OutputFormat,
-    std::string, description, get_description);
+    std::string, description, description);
+%attributemap(OutputFormat,
+    map_string_Option, options, options);
 
-%attributestring(sigrok::Device, std::string, description, get_description);
-%attributestring(sigrok::Device, std::string, vendor, get_vendor);
-%attributestring(sigrok::Device, std::string, model, get_model);
-%attributestring(sigrok::Device, std::string, version, get_version);
+%attributestring(sigrok::Device, std::string, vendor, vendor);
+%attributestring(sigrok::Device, std::string, model, model);
+%attributestring(sigrok::Device, std::string, version, version);
 
-%attributeval(sigrok::Device,
+%attributevector(Device,
     std::vector<std::shared_ptr<sigrok::Channel> >,
-    channels, get_channels);
+    channels, channels);
 
-%attributeval(sigrok::Device, map_string_ChannelGroup,
-    channel_groups, get_channel_groups);
+%attributemap(Device, map_string_ChannelGroup,
+    channel_groups, channel_groups);
 
 /* Using %attributestring for shared_ptr attribute. See
    http://sourceforge.net/p/swig/mailman/message/31832070/ */
 %attributestring(sigrok::HardwareDevice,
-    std::shared_ptr<sigrok::Driver>, driver, get_driver);
+    std::shared_ptr<sigrok::Driver>, driver, driver);
 
-%attributestring(sigrok::Channel, std::string, name, get_name, set_name);
-%attribute(sigrok::Channel, bool, enabled, get_enabled, set_enabled);
-%attribute(sigrok::Channel, const sigrok::ChannelType *, type, get_type);
+%attributestring(sigrok::Channel, std::string, name, name, set_name);
+%attribute(sigrok::Channel, bool, enabled, enabled, set_enabled);
+%attribute(sigrok::Channel, const sigrok::ChannelType *, type, type);
+%attribute(sigrok::Channel, unsigned int, index, index);
 
-%attributestring(sigrok::ChannelGroup, std::string, name, get_name);
-%attributeval(sigrok::ChannelGroup,
+%attributestring(sigrok::ChannelGroup, std::string, name, name);
+%attributevector(ChannelGroup,
     std::vector<std::shared_ptr<sigrok::Channel> >,
-    channels, get_channels);
+    channels, channels);
 
-%attributestring(sigrok::Trigger, std::string, name, get_name);
-%attributeval(sigrok::Trigger,
+%attributestring(sigrok::Trigger, std::string, name, name);
+%attributevector(Trigger,
     std::vector<std::shared_ptr<sigrok::TriggerStage> >,
-    stages, get_stages);
+    stages, stages);
 
-%attribute(sigrok::TriggerStage, int, number, get_number);
-%attributeval(sigrok::TriggerStage,
+%attribute(sigrok::TriggerStage, int, number, number);
+%attributevector(TriggerStage,
     std::vector<std::shared_ptr<sigrok::TriggerMatch> >,
-    matches, get_matches);
+    matches, matches);
 
 %attributestring(sigrok::TriggerMatch,
-    std::shared_ptr<sigrok::Channel>, channel, get_channel);
-%attribute(sigrok::TriggerMatch, const sigrok::TriggerMatchType *, type, get_type);
-%attribute(sigrok::TriggerMatch, float, value, get_value);
+    std::shared_ptr<sigrok::Channel>, channel, channel);
+%attribute(sigrok::TriggerMatch, const sigrok::TriggerMatchType *, type, type);
+%attribute(sigrok::TriggerMatch, float, value, value);
 
-%attributeval(sigrok::Session,
+%attributevector(Session,
     std::vector<std::shared_ptr<sigrok::Device> >,
-    devices, get_devices);
+    devices, devices);
 
 %attributestring(sigrok::Session,
-    std::shared_ptr<sigrok::Trigger>, trigger, get_trigger, set_trigger);
+    std::shared_ptr<sigrok::Trigger>, trigger, trigger, set_trigger);
+
+%attributestring(sigrok::Session, std::string, filename, filename);
 
-%attributestring(sigrok::Packet,
-    std::shared_ptr<sigrok::PacketPayload>, payload, get_payload);
+%attribute(sigrok::Packet,
+    const sigrok::PacketType *, type, type);
 
-%attributeval(sigrok::Meta, map_ConfigKey_Variant, config, get_config);
+%attributemap(Meta, map_ConfigKey_Variant, config, config);
 
-%attribute(sigrok::Analog, int, num_samples, get_num_samples);
-%attribute(sigrok::Analog, const sigrok::Quantity *, mq, get_mq);
-%attribute(sigrok::Analog, const sigrok::Unit *, unit, get_unit);
-%attributeval(sigrok::Analog, std::vector<const sigrok::QuantityFlag *>, mq_flags, get_mq_flags);
+%attributevector(Analog,
+    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);
+
+#endif
+
+%include <libsigrokcxx/libsigrokcxx.hpp>
+
+%include "swig/enums.i"
+
+namespace sigrok {
+%include <libsigrokcxx/enums.hpp>
+}