From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Sat, 27 Mar 2010 09:17:09 +0000 (+0100)
Subject: gstreamer: Fix ownerships in Gst.Caps bindings and remove private API
X-Git-Tag: 0.9.1~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f112c0f045689900bfb88a3e58c2278e5c77ffb;p=thirdparty%2Fvala.git

gstreamer: Fix ownerships in Gst.Caps bindings and remove private API
---

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 8c8eddd6e..d92ac714d 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -159,12 +159,9 @@ namespace Gst {
 	[CCode (ref_function = "gst_caps_ref", unref_function = "gst_caps_unref", cheader_filename = "gst/gst.h")]
 	public class Caps {
 		public Gst.CapsFlags flags;
-		public int refcount;
-		public weak GLib.PtrArray structs;
-		public GLib.Type type;
 		[CCode (has_construct_function = false)]
 		public Caps.any ();
-		public void append (Gst.Caps caps2);
+		public void append (owned Gst.Caps caps2);
 		public void append_structure (owned Gst.Structure structure);
 		public bool can_intersect (Gst.Caps caps2);
 		public Gst.Caps copy ();
@@ -179,30 +176,31 @@ namespace Gst {
 		public Caps.full_valist (Gst.Structure structure, void* var_args);
 		public uint get_size ();
 		public unowned Gst.Structure get_structure (uint index);
-		public unowned Gst.Caps intersect (Gst.Caps caps2);
+		public Gst.Caps intersect (Gst.Caps caps2);
 		public bool is_always_compatible (Gst.Caps caps2);
 		public bool is_any ();
 		public bool is_empty ();
 		public bool is_equal (Gst.Caps caps2);
 		public bool is_equal_fixed (Gst.Caps caps2);
 		public bool is_fixed ();
+		[CCode (cname = "GST_CAPS_IS_SIMPLE")]
+		public bool is_simple ();
 		public bool is_subset (Gst.Caps superset);
-		public static unowned Gst.Caps load_thyself (void* parent);
+		public static Gst.Caps load_thyself (void* parent);
 		[ReturnsModifiedPointer]
 		public void make_writable ();
-		public void merge (Gst.Caps caps2);
-		public void merge_structure (Gst.Structure structure);
-		public unowned Gst.Caps normalize ();
-		public unowned Gst.Caps @ref ();
+		public void merge (owned Gst.Caps caps2);
+		public void merge_structure (owned Gst.Structure structure);
+		public Gst.Caps normalize ();
+		public Gst.Caps @ref ();
 		public void remove_structure (uint idx);
-		public void replace (Gst.Caps newcaps);
 		public void* save_thyself (void* parent);
 		public void set_simple (string field, ...);
 		public void set_simple_valist (string field, void* varargs);
 		public void set_value (string field, Gst.Value value);
 		[CCode (has_construct_function = false)]
 		public Caps.simple (string media_type, string fieldname, ...);
-		public unowned Gst.Caps subtract (Gst.Caps subtrahend);
+		public Gst.Caps subtract (Gst.Caps subtrahend);
 		public string to_string ();
 		public void truncate ();
 		public Gst.Caps union (Gst.Caps caps2);
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 a907e08aa..69c71de20 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -100,10 +100,14 @@ namespace Gst {
 	public delegate bool DataProbeCallback (Gst.Pad pad, Gst.MiniObject data);
 
 	public class Caps {
-		public unowned Caps @ref ();
+		public Caps @ref ();
 		public void unref ();
+
 		[ReturnsModifiedPointer]
 		public void make_writable ();
+
+		[CCode (cname = "GST_CAPS_IS_SIMPLE")]
+		public bool is_simple ();
 	}
 
 	public class MiniObject {
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index 51f3ab06f..7a59d1d9e 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -60,7 +60,13 @@ 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"
+GstCaps.type hidden="1"
+GstCaps.structs hidden="1"
+GstCaps.refcount hidden="1"
+gst_caps_append_structure.structure value_owned="1"
+gst_caps_append.caps2 value_owned="1"
+gst_caps_merge.caps2 value_owned="1"
+gst_caps_merge_structure.structure value_owned="1"
 gst_caps_copy transfer_ownership="1"
 gst_caps_copy_nth transfer_ownership="1"
 gst_caps_from_string transfer_ownership="1"
@@ -69,7 +75,12 @@ gst_caps_new_full ellipsis="1"
 gst_caps_new_simple ellipsis="1"
 gst_caps_set_simple ellipsis="1"
 gst_caps_union transfer_ownership="1"
+gst_caps_intersect transfer_ownership="1"
+gst_caps_normalize transfer_ownership="1"
+gst_caps_subtract transfer_ownership="1"
+gst_caps_load_thyself transfer_ownership="1"
 gst_caps_to_string transfer_ownership="1"
+gst_caps_replace hidden="1"
 GstChildProxy::child_added has_emitter="1"
 GstChildProxy::child_removed has_emitter="1"
 GstClockTime hidden="1"