From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Thu, 8 Apr 2010 14:07:27 +0000 (+0200)
Subject: gstreamer: Fix and clean up Gst.Object bindings
X-Git-Tag: 0.9.1~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d033085bd4fbc537f5383fc6a23e56af615f644a;p=thirdparty%2Fvala.git

gstreamer: Fix and clean up Gst.Object bindings
---

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 6920b395b..1d7912055 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -716,7 +716,7 @@ namespace Gst {
 		public Message.warning (Gst.Object src, GLib.Error error, string? debug);
 	}
 	[CCode (ref_function = "gst_mini_object_ref", unref_function = "gst_mini_object_unref", cheader_filename = "gst/gst.h")]
-	public class MiniObject {
+	public abstract class MiniObject {
 		public Gst.MiniObjectFlags flags;
 		[CCode (has_construct_function = false)]
 		public MiniObject (GLib.Type type);
@@ -736,20 +736,29 @@ namespace Gst {
 		public void unref ();
 	}
 	[CCode (ref_function = "gst_object_ref", unref_function = "gst_object_unref", cheader_filename = "gst/gst.h")]
-	public class Object : GLib.Object {
-		public uint32 flags;
+	public abstract class Object : GLib.Object {
+		public Gst.ObjectFlags flags;
 		public weak GLib.Mutex @lock;
 		public weak string name_prefix;
 		public weak Gst.Object parent;
-		public int refcount;
-		public static bool check_uniqueness (GLib.List list, string name);
-		public static void default_deep_notify (GLib.Object object, Gst.Object orig, GLib.ParamSpec pspec, string excluded_props);
-		public void default_error (GLib.Error error, string debug);
+		public static bool check_uniqueness (GLib.List<Gst.Object> list, string name);
+		public static void default_deep_notify (GLib.Object object, Gst.Object orig, GLib.ParamSpec pspec, string? excluded_props);
+		public void default_error (GLib.Error error, string? debug);
+		[CCode (cname = "GST_OBJECT_FLAG_IS_SET")]
+		public bool flag_is_set (Gst.ObjectFlags flag);
+		[CCode (cname = "GST_OBJECT_FLAG_SET")]
+		public void flag_set (Gst.ObjectFlags flag);
+		[CCode (cname = "GST_OBJECT_FLAG_UNSET")]
+		public void flag_unset (Gst.ObjectFlags flag);
 		public string get_name ();
 		public string get_name_prefix ();
 		public Gst.Object get_parent ();
 		public string get_path_string ();
 		public bool has_ancestor (Gst.Object ancestor);
+		[CCode (cname = "GST_OBJECT_IS_DISPOSING")]
+		public bool is_disposing ();
+		[CCode (cname = "GST_OBJECT_IS_FLOATING")]
+		public bool is_floating ();
 		public Gst.Object @ref ();
 		public void ref_sink ();
 		public static void replace (ref Gst.Object? oldobj, Gst.Object? newobj);
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 8b6d23b35..b27bc50f7 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -132,12 +132,23 @@ namespace Gst {
 	}
 
 	[CCode (ref_function = "gst_object_ref", unref_function = "gst_object_unref", ref_sink_function = "gst_object_ref_sink")]
-	public class Object {
+	public abstract class Object {
 		public Gst.Object @ref ();
 		public void unref ();
 		public void sink ();
 		public void ref_sink ();
 		public static void replace (ref Gst.Object? oldobj, Gst.Object? newobj);
+
+		[CCode (cname = "GST_OBJECT_FLAG_IS_SET")]
+		public bool flag_is_set (Gst.ObjectFlags flag);
+		[CCode (cname = "GST_OBJECT_FLAG_SET")]
+		public void flag_set (Gst.ObjectFlags flag);
+		[CCode (cname = "GST_OBJECT_FLAG_UNSET")]
+		public void flag_unset (Gst.ObjectFlags flag);
+		[CCode (cname = "GST_OBJECT_IS_FLOATING")]
+		public bool is_floating ();
+		[CCode (cname = "GST_OBJECT_IS_DISPOSING")]
+		public bool is_disposing ();
 	}
 
 	public class Bin {
@@ -245,7 +256,7 @@ namespace Gst {
 		public static void replace (ref Caps? oldobj, Caps? newobj);
 	}
 
-	public class MiniObject {
+	public abstract class MiniObject {
 		[ReturnsModifiedPointer]
 		public void make_writable ();
 
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index 58081aeb5..dcd29d3ae 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -310,7 +310,7 @@ gst_message_set_stream_status_object.object is_ref="1" nullable="1"
 gst_message_type_get_name hidden="1"
 gst_message_type_to_quark hidden="1"
 GstMessageType to_string="gst_message_type_get_name"
-GstMiniObject is_fundamental="1"
+GstMiniObject is_fundamental="1" abstract="1"
 GstMiniObject.instance hidden="1"
 GstMiniObject.refcount hidden="1"
 GstMiniObject.flags type_name="MiniObjectFlags"
@@ -318,8 +318,14 @@ GstMiniObjectClass hidden="1"
 gst_mini_object_make_writable hidden="1"
 gst_mini_object_copy hidden="1"
 gst_mini_object_replace hidden="1"
+GstObject abstract="1"
+GstObject.flags type_name="ObjectFlags"
+GstObject.refcount hidden="1"
 GstObjectClass hidden="1"
+gst_object_check_uniqueness.list type_arguments="Gst.Object"
 gst_object_default_error throws="0"
+gst_object_default_error.debug nullable="1"
+gst_object_default_deep_notify.excluded_props nullable="1"
 gst_class_signal_connect hidden="1"
 gst_class_signal_emit_by_name hidden="1"
 gst_object_get_name transfer_ownership="1"