bindings: Overhaul packet & payload classes.

[libsigrok.git] / bindings / swig / classes.i

diff --git a/bindings/swig/classes.i b/bindings/swig/classes.i
index ff4435c118e792dfc6f526c683b9221d73b4527b..445fdfbb2d5cfce63047e807a49480da9a942f10 100644 (file)
--- a/bindings/swig/classes.i
+++ b/bindings/swig/classes.i
@@ -17,6 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma SWIG nowarn=325,401
+
 %{
 #include "libsigrok/libsigrok.hpp"
 using namespace std;
@@ -68,6 +70,8 @@ template< class T > class enable_shared_from_this;
 %shared_ptr(sigrok::Session);
 %shared_ptr(sigrok::Packet);
 %shared_ptr(sigrok::PacketPayload);
+%shared_ptr(sigrok::Header);
+%shared_ptr(sigrok::Meta);
 %shared_ptr(sigrok::Analog);
 %shared_ptr(sigrok::Logic);
 %shared_ptr(sigrok::InputFormat);
@@ -141,6 +145,8 @@ 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<const sigrok::ConfigKey *, Glib::VariantBase>
+    map_ConfigKey_Variant;
 }
 
 %attributeval(sigrok::Context,
@@ -218,7 +224,13 @@ typedef std::map<std::string, std::shared_ptr<sigrok::ChannelGroup> >
     std::vector<std::shared_ptr<sigrok::Device> >,
     devices, get_devices);
 
-%attribute(sigrok::Packet, sigrok::PacketPayload *, payload, get_payload);
+%attributestring(sigrok::Session,
+    std::shared_ptr<sigrok::Trigger>, trigger, get_trigger, set_trigger);
+
+%attributestring(sigrok::Packet,
+    std::shared_ptr<sigrok::PacketPayload>, payload, get_payload);
+
+%attributeval(sigrok::Meta, map_ConfigKey_Variant, config, get_config);
 
 %attribute(sigrok::Analog, int, num_samples, get_num_samples);
 %attribute(sigrok::Analog, const sigrok::Quantity *, mq, get_mq);