From: Jens Georg <mail@jensge.org>
Date: Sun, 6 Nov 2011 12:51:50 +0000 (+0100)
Subject: gstreamer-0.10: Fix ElementFactory methods and ElementFactoryListType
X-Git-Tag: 0.14.1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=327a944ca82afce5ae732c28fd73469f061441df;p=thirdparty%2Fvala.git

gstreamer-0.10: Fix ElementFactory methods and ElementFactoryListType

Set proper return type and ownership for ElementFactory.list_filter
and ElementFactory.list_get_elements as well as making
ElementFactoryListType inherit from int64.

Fixes bug 663499.
---

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index fed7e7139..6333a6e51 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -528,16 +528,12 @@ namespace Gst {
 		public string[]? get_uri_protocols ();
 		public int get_uri_type ();
 		public bool has_interface (string interfacename);
-		public static unowned GLib.List list_filter (GLib.List list, Gst.Caps caps, Gst.PadDirection direction, bool subsetonly);
-		public static unowned GLib.List list_get_elements (Gst.ElementFactoryListType type, Gst.Rank minrank);
+		public static GLib.List<Gst.ElementFactory> list_filter (GLib.List<Gst.ElementFactory> list, Gst.Caps caps, Gst.PadDirection direction, bool subsetonly);
+		public static GLib.List<Gst.ElementFactory> list_get_elements (Gst.ElementFactoryListType type, Gst.Rank minrank);
 		public bool list_is_type (Gst.ElementFactoryListType type);
 		[CCode (returns_floating_reference = true)]
 		public static Gst.Element? make (string factoryname, string? name);
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	[Compact]
-	public class ElementFactoryListType {
-	}
 	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_event_ref", unref_function = "gst_event_unref")]
 	public class Event : Gst.MiniObject {
 		public weak Gst.Object src;
@@ -1616,6 +1612,9 @@ namespace Gst {
 		public weak string author;
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
+	public struct ElementFactoryListType : uint64 {
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
 	public struct FormatDefinition {
 		public Gst.Format value;
 		public weak string nick;
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 9f0f44951..dc85a0536 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -539,4 +539,7 @@ namespace Gst {
 		public static void ignored (Gst.Poll @set, Gst.PollFD fd);
 		public void init ();
 	}
+
+	public struct ElementFactoryListType : uint64 {
+	}
 }
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index ebd2f9a43..1471dcf43 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -170,6 +170,10 @@ gst_element_factory_create hidden="1"
 gst_element_factory_get_static_pad_templates type_arguments="StaticPadTemplate"
 gst_element_factory_find transfer_ownership="1" nullable="1"
 gst_element_factory_get_uri_protocols is_array="1" array_null_terminated="1" transfer_ownership="1" nullable="1"
+gst_element_factory_list_get_elements transfer_ownership="1" type_arguments="ElementFactory"
+gst_element_factory_list_filter transfer_ownership="1" type_arguments="ElementFactory"
+gst_element_factory_list_filter.list transfer_ownership="0" type_arguments="ElementFactory"
+GstElementFactoryListType hidden="1"
 gst_error_get_message transfer_ownership="1"
 GstEvent base_class="GstMiniObject"
 GstEvent.mini_object hidden="1"