swig: Use new output API.

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

diff --git a/bindings/swig/libsigrok.i b/bindings/swig/libsigrok.i
index bbabdf2e3cd5bb184e98849a876df17467842c22..3e33963fa58de1ff46dfe0e3675055fa93a9eced 100644 (file)
--- a/bindings/swig/libsigrok.i
+++ b/bindings/swig/libsigrok.i
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Martin Ling <martin-sigrok@earth.li>
  *
@@ -26,6 +26,7 @@
 %}
 
 typedef void *gpointer;
+typedef int gboolean;
 
 typedef struct _GSList GSList;
 
@@ -49,6 +50,34 @@ double g_variant_get_double(GVariant *value);
 char *g_variant_get_string(GVariant *value, unsigned long *length);
 GVariant *g_variant_get_child_value(GVariant *value, unsigned long index);
 
+typedef guint (*GHashFunc)(gconstpointer key);
+typedef gboolean (*GEqualFunc)(gconstpointer a, gconstpointer b);
+typedef void (*GDestroyNotify)(gpointer data);
+
+GHashTable *g_hash_table_new_full(GHashFunc hash_func, GEqualFunc key_equal_func,
+        GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func);
+void g_hash_table_insert(GHashTable *hash_table, gpointer key, gpointer value);
+void g_hash_table_destroy(GHashTable *hash_table);
+
+%callback("%s_ptr");
+guint g_str_hash(gconstpointer v);
+gboolean g_str_equal(gconstpointer v1, gconstpointer v2);;
+void g_free(gpointer mem);
+%nocallback;
+
+gchar *g_strdup(const char *str);
+
+typedef struct _GString GString;
+
+struct _GString
+{
+  char *str;
+  gsize len;
+  gsize allocated_len;
+};
+
+gchar *g_string_free(GString *string, gboolean free_segment);
+
 %include "libsigrok/libsigrok.h"
 #undef SR_API
 #define SR_API
@@ -56,9 +85,47 @@ GVariant *g_variant_get_child_value(GVariant *value, unsigned long index);
 %include "libsigrok/proto.h"
 %include "libsigrok/version.h"
 
+%array_class(float, float_array);
+%pointer_functions(uint8_t *, uint8_ptr_ptr);
+%pointer_functions(uint64_t, uint64_ptr);
+%pointer_functions(GString *, gstring_ptr_ptr);
 %pointer_functions(GVariant *, gvariant_ptr_ptr);
 %array_functions(GVariant *, gvariant_ptr_array);
 %pointer_functions(struct sr_context *, sr_context_ptr_ptr);
 %array_functions(struct sr_dev_driver *, sr_dev_driver_ptr_array);
+%array_functions(struct sr_input_format *, sr_input_format_ptr_array);
+%array_functions(struct sr_output_format *, sr_output_format_ptr_array);
 %pointer_cast(gpointer, struct sr_dev_inst *, gpointer_to_sr_dev_inst_ptr);
 %pointer_cast(void *, struct sr_datafeed_logic *, void_ptr_to_sr_datafeed_logic_ptr)
+%pointer_cast(void *, struct sr_datafeed_analog *, void_ptr_to_sr_datafeed_analog_ptr)
+%pointer_cast(void *, struct sr_channel *, void_ptr_to_sr_channel_ptr)
+%pointer_cast(void *, struct sr_channel_group *, void_ptr_to_sr_channel_group_ptr)
+
+%extend sr_input_format {
+        int call_format_match(const char *filename) {
+                return $self->format_match(filename);
+        }
+
+        int call_init(struct sr_input *in, const char *filename) {
+                return $self->init(in, filename);
+        }
+
+        int call_loadfile(struct sr_input *in, const char *filename) {
+                return $self->loadfile(in, filename);
+        }
+}
+
+%extend sr_output_format {
+        int call_init(struct sr_output *o) {
+                return $self->init(o);
+        }
+
+        int call_receive(struct sr_output *o,
+                        const struct sr_datafeed_packet *packet, GString **out) {
+                return $self->receive(o, packet, out);
+        }
+
+        int call_cleanup(struct sr_output *o) {
+                return $self->cleanup(o);
+        }
+}