From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Sat, 27 Mar 2010 08:44:45 +0000 (+0100)
Subject: gstreamer: Fix Gst.Bin parameter/return ownerships and generic type
X-Git-Tag: 0.9.1~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be05dadaabe0069627830e31947a30ddc3306195;p=thirdparty%2Fvala.git

gstreamer: Fix Gst.Bin parameter/return ownerships and generic type
---

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index b5883f54a..5e03c6082 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -22,7 +22,7 @@ namespace Gst {
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class Bin : Gst.Element, Gst.ChildProxy {
 		public weak Gst.Bus child_bus;
-		public weak GLib.List<Gst.Pad> children;
+		public weak GLib.List<Gst.Element> children;
 		public uint32 children_cookie;
 		public bool clock_dirty;
 		public weak Gst.Element clock_provider;
@@ -37,11 +37,11 @@ namespace Gst {
 		[NoWrapper]
 		public virtual bool add_element (Gst.Element element);
 		public void add_many (params owned Gst.Element[] elements);
-		public Gst.Pad find_unconnected_pad (Gst.PadDirection direction);
-		public unowned Gst.Pad find_unlinked_pad (Gst.PadDirection direction);
-		public Gst.Element get_by_interface (GLib.Type iface);
-		public Gst.Element get_by_name (string name);
-		public Gst.Element get_by_name_recurse_up (string name);
+		public Gst.Pad? find_unconnected_pad (Gst.PadDirection direction);
+		public Gst.Pad? find_unlinked_pad (Gst.PadDirection direction);
+		public Gst.Element? get_by_interface (GLib.Type iface);
+		public Gst.Element? get_by_name (string name);
+		public Gst.Element? get_by_name_recurse_up (string name);
 		[NoWrapper]
 		public virtual void handle_message (Gst.Message message);
 		public Gst.Iterator iterate_all_by_interface (GLib.Type iface);
@@ -51,10 +51,10 @@ namespace Gst {
 		public Gst.Iterator iterate_sorted ();
 		public Gst.Iterator iterate_sources ();
 		public bool recalculate_latency ();
-		public bool remove (Gst.Element element);
+		public bool remove (owned Gst.Element element);
 		[NoWrapper]
 		public virtual bool remove_element (Gst.Element element);
-		public void remove_many (Gst.Element element_1, ...);
+		public void remove_many (params owned Gst.Element[] elements);
 		[NoAccessorMethod]
 		public bool async_handling { get; set; }
 		public virtual signal bool do_latency ();
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 38a32c47c..4a3dbce5e 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -46,6 +46,7 @@ namespace Gst {
 
 	public class Bin {
 		public void add_many (params owned Gst.Element[] elements);
+		public void remove_many (params owned Gst.Element[] elements);
 	}
 
 	[CCode (ref_function = "gst_buffer_ref", unref_function = "gst_buffer_unref")]
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index 49ab653d3..50782bf75 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -2,21 +2,23 @@ Gst cprefix="Gst" lower_case_cprefix="gst_" cheader_filename="gst/gst.h"
 GstAllocTrace.mem_live type_arguments="pointer"
 gst_alloc_trace_list type_arguments="AllocTrace"
 GstBin.priv hidden="1"
-GstBin.children type_arguments="Pad"
+GstBin.children type_arguments="Element"
 GstBin.messages type_arguments="Message"
 gst_bin_add.element value_owned="1"
+gst_bin_remove.element value_owned="1"
 gst_bin_add_many hidden="1"
-gst_bin_remove_many ellipsis="1"
-gst_bin_get_by_name transfer_ownership="1"
-gst_bin_get_by_name_recurse_up transfer_ownership="1"
-gst_bin_get_by_interface transfer_ownership="1"
+gst_bin_remove_many hidden="1"
+gst_bin_get_by_name transfer_ownership="1" nullable="1"
+gst_bin_get_by_name_recurse_up transfer_ownership="1" nullable="1"
+gst_bin_get_by_interface transfer_ownership="1" nullable="1"
 gst_bin_iterate_elements transfer_ownership="1"
 gst_bin_iterate_recurse transfer_ownership="1"
 gst_bin_iterate_sinks transfer_ownership="1"
 gst_bin_iterate_sorted transfer_ownership="1"
 gst_bin_iterate_sources transfer_ownership="1"
 gst_bin_iterate_all_by_interface transfer_ownership="1"
-gst_bin_find_unconnected_pad transfer_ownership="1"
+gst_bin_find_unconnected_pad transfer_ownership="1" nullable="1"
+gst_bin_find_unlinked_pad transfer_ownership="1" nullable="1"
 GstBuffer base_class="GstMiniObject"
 GstBuffer.data is_array="1" array_length_cname="size" array_length_type="guint" type_name="uint8"
 GstBuffer.mini_object hidden="1"