gstreamer: Fix ownerships and nullablility of parameters/return types in Gst.Bus...

Also mark all fields as hidden, they're private!

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index d034511b79e95fb44879cc9ec0425c893c848bd2..8c8eddd6ef6ea8763297d858dccee5d4eb5b9699 100644 (file)
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -128,12 +128,6 @@ namespace Gst {
        }
        [CCode (cheader_filename = "gst/gst.h")]
        public class Bus : Gst.Object {
-               public uint num_signal_watchers;
-               public weak GLib.Queue queue;
-               public weak GLib.Mutex queue_lock;
-               public uint signal_watch_id;
-               public weak Gst.BusSyncHandler sync_handler;
-               public void* sync_handler_data;
                [CCode (has_construct_function = false)]
                public Bus ();
                public void add_signal_watch ();
@@ -141,23 +135,24 @@ namespace Gst {
                [CCode (cname = "gst_bus_add_watch_full")]
                public uint add_watch (owned Gst.BusFunc func, [CCode (pos = 0.1)] int priority = GLib.Priority.DEFAULT);
                public uint add_watch_full (int priority, owned Gst.BusFunc func);
-               public bool async_signal_func (Gst.Message message, void* data);
-               public unowned GLib.TimeoutSource create_watch ();
+               [CCode (instance_pos = -1)]
+               public bool async_signal_func (Gst.Bus bus, Gst.Message message);
+               public GLib.TimeoutSource create_watch ();
                public void disable_sync_message_emission ();
                public void enable_sync_message_emission ();
                public bool have_pending ();
-               public Gst.Message peek ();
+               public Gst.Message? peek ();
                public Gst.Message? poll (Gst.MessageType events, Gst.ClockTimeDiff timeout);
-               public Gst.Message pop ();
-               public Gst.Message pop_filtered (Gst.MessageType types);
+               public Gst.Message? pop ();
+               public Gst.Message? pop_filtered (Gst.MessageType types);
                public bool post (owned Gst.Message message);
                public void remove_signal_watch ();
                public void set_flushing (bool flushing);
-               public void set_sync_handler (Gst.BusSyncHandler func);
+               public void set_sync_handler (Gst.BusSyncHandler? func);
                [CCode (instance_pos = -1)]
                public Gst.BusSyncReply sync_signal_handler (Gst.Bus bus, Gst.Message message);
-               public Gst.Message timed_pop (Gst.ClockTime timeout);
-               public Gst.Message timed_pop_filtered (Gst.ClockTime timeout, Gst.MessageType types);
+               public Gst.Message? timed_pop (Gst.ClockTime timeout);
+               public Gst.Message? timed_pop_filtered (Gst.ClockTime timeout, Gst.MessageType types);
                public virtual signal void message (Gst.Message message);
                public virtual signal void sync_message (Gst.Message message);
        }

diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
index 4a3dbce5e39b02ad88cc2a0665e8d11205a61c86..a907e08aa009117bd6562ab95667124409a78e6a 100644 (file)
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -74,6 +74,9 @@ namespace Gst {
                public uint add_watch (owned Gst.BusFunc func, [CCode (pos = 0.1)] int priority = GLib.Priority.DEFAULT);
                [CCode (instance_pos = -1)]
                public Gst.BusSyncReply sync_signal_handler (Gst.Bus bus, Gst.Message message);
+
+               [CCode (instance_pos = -1)]
+               public bool async_signal_func (Gst.Bus bus, Gst.Message message);
        }
 
        [CCode (cheader_filename = "gst/gst.h")]

diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index 1a892bd565f32166f03094028cd68a58013dbe5f..51f3ab06fd9e1800afa9328a4492be4d602a6087 100644 (file)
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -44,18 +44,22 @@ gst_buffer_list_iterator_next nullable="1"
 gst_buffer_list_iterator_steal nullable="1"
 gst_buffer_list_iterator_do nullable="1"
 GstBufferListDoFunction nullable="1"
+GstBus.* hidden="1"
+gst_bus_async_signal_func hidden="1"
 gst_bus_add_watch hidden="1"
 gst_bus_add_watch_full.func value_owned="1"
 gst_bus_add_watch_full.notify hidden="1"
 gst_bus_set_sync_handler.data hidden="1"
 gst_bus_sync_signal_handler hidden="1"
-gst_bus_peek transfer_ownership="1"
+gst_bus_peek transfer_ownership="1" nullable="1"
 gst_bus_poll transfer_ownership="1" nullable="1"
-gst_bus_pop transfer_ownership="1"
-gst_bus_pop_filtered transfer_ownership="1"
+gst_bus_pop transfer_ownership="1" nullable="1"
+gst_bus_pop_filtered transfer_ownership="1" nullable="1"
 gst_bus_post.message takes_ownership="1"
-gst_bus_timed_pop transfer_ownership="1"
-gst_bus_timed_pop_filtered transfer_ownership="1"
+gst_bus_set_sync_handler.func nullable="1"
+gst_bus_timed_pop transfer_ownership="1" nullable="1"
+gst_bus_timed_pop_filtered transfer_ownership="1" nullable="1"
+gst_bus_create_watch transfer_ownership="1"
 gst_caps_append_structure.structure transfer_ownership="1"
 gst_caps_copy transfer_ownership="1"
 gst_caps_copy_nth transfer_ownership="1"