From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Sat, 3 Apr 2010 13:00:16 +0000 (+0200)
Subject: gstreamer: Fix some random ownership/nullable problems
X-Git-Tag: 0.9.1~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d614302be5e6ae81bd7074b9f07fa316cd42592b;p=thirdparty%2Fvala.git

gstreamer: Fix some random ownership/nullable problems
---

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index e85e86a43..3e80644a6 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -51,10 +51,10 @@ namespace Gst {
 		public Gst.Iterator iterate_sorted ();
 		public Gst.Iterator iterate_sources ();
 		public bool recalculate_latency ();
-		public bool remove (owned Gst.Element element);
+		public bool remove (Gst.Element element);
 		[NoWrapper]
 		public virtual bool remove_element (Gst.Element element);
-		public void remove_many (params owned Gst.Element[] elements);
+		public void remove_many (params Gst.Element[] elements);
 		[NoAccessorMethod]
 		public bool async_handling { get; set; }
 		public virtual signal bool do_latency ();
@@ -275,6 +275,7 @@ namespace Gst {
 		public Gst.ClockEntryType type;
 		public void* user_data;
 	}
+	[Compact]
 	[CCode (ref_function = "gst_clock_id_ref", unref_function = "gst_clock_id_unref", cheader_filename = "gst/gst.h")]
 	public class ClockID {
 		public static int compare_func (void* id1, void* id2);
@@ -1433,12 +1434,12 @@ namespace Gst {
 	[CCode (cheader_filename = "gst/gst.h")]
 	public interface ChildProxy : Gst.Object {
 		public void @get (string first_property_name, ...);
-		public abstract Gst.Object get_child_by_index (uint index);
-		public Gst.Object get_child_by_name (string name);
+		public abstract Gst.Object? get_child_by_index (uint index);
+		public Gst.Object? get_child_by_name (string name);
 		public abstract uint get_children_count ();
 		public void get_property (string name, ref Gst.Value value);
 		public void get_valist (string first_property_name, void* var_args);
-		public bool lookup (string name, out Gst.Object target, out unowned GLib.ParamSpec pspec);
+		public bool lookup (string name, out Gst.Object? target, out unowned GLib.ParamSpec? pspec);
 		public void @set (string first_property_name, ...);
 		public void set_property (string name, Gst.Value value);
 		public void set_valist (string first_property_name, void* var_args);
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 ed8cc16d1..6f27bc534 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -32,6 +32,7 @@ namespace Gst {
 	public struct ClockTimeDiff : int64 {
 	}
 
+	[Compact]
 	public class ClockID {
 		public ClockID.single_shot (Gst.Clock clock, Gst.ClockTime time);
 		public ClockID.periodic (Gst.Clock clock, Gst.ClockTime start_time, Gst.ClockTime interval);
@@ -85,7 +86,7 @@ namespace Gst {
 
 	public class Bin {
 		public void add_many (params owned Gst.Element[] elements);
-		public void remove_many (params owned Gst.Element[] elements);
+		public void remove_many (params Gst.Element[] elements);
 	}
 
 	[CCode (ref_function = "gst_buffer_ref", unref_function = "gst_buffer_unref")]
@@ -136,7 +137,7 @@ namespace Gst {
 		public void @get (string first_property_name, ...);
 		public void get_property (string name, ref Gst.Value value);
 		public void get_valist (string first_property_name, void* var_args);
-		public bool lookup (string name, out Gst.Object target, out unowned GLib.ParamSpec pspec);
+		public bool lookup (string name, out Gst.Object? target, out unowned GLib.ParamSpec? pspec);
 		public void @set (string first_property_name, ...);
 		public void set_property (string name, Gst.Value value);
 		public void set_valist (string first_property_name, void* var_args);
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index 4c97b903a..c7a2fd963 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -5,7 +5,7 @@ GstBin.priv hidden="1"
 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_remove.element
 gst_bin_add_many hidden="1"
 gst_bin_remove_many hidden="1"
 gst_bin_get_by_name transfer_ownership="1" nullable="1"
@@ -83,8 +83,8 @@ gst_caps_to_string transfer_ownership="1"
 gst_caps_replace hidden="1"
 GstChildProxy::child_added has_emitter="1"
 GstChildProxy::child_removed has_emitter="1"
-gst_child_proxy_get_child_by_name transfer_ownership="1"
-gst_child_proxy_get_child_by_index transfer_ownership="1"
+gst_child_proxy_get_child_by_name transfer_ownership="1" nullable="1"
+gst_child_proxy_get_child_by_index transfer_ownership="1" nullable="1"
 gst_child_proxy_get hidden="1"
 gst_child_proxy_get_property hidden="1"
 gst_child_proxy_get_valist hidden="1"