From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 5 Jul 2011 07:19:47 +0000 (+0200)
Subject: gstreamer-0.10: Fix Pad.get_fixed_caps_func and get_proxy_(get/set)caps
X-Git-Tag: 0.13.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f7eefa79a5bcc8ac3a1285abb7bdb97fcba5739;p=thirdparty%2Fvala.git

gstreamer-0.10: Fix Pad.get_fixed_caps_func and get_proxy_(get/set)caps

Fixes bug 639883.
---

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 7d79b5c7f..98659fcea 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -844,8 +844,7 @@ namespace Gst {
 		public Gst.Caps get_caps_reffed ();
 		public Gst.PadDirection get_direction ();
 		public void* get_element_private ();
-		[CCode (instance_pos = -1)]
-		public Gst.Caps get_fixed_caps_func (Gst.Pad pad);
+		public Gst.Caps get_fixed_caps_func ();
 		public GLib.List<Gst.Pad> get_internal_links ();
 		public GLib.List<Gst.Pad> get_internal_links_default ();
 		public Gst.Caps get_negotiated_caps ();
@@ -872,9 +871,7 @@ namespace Gst {
 		public Gst.Caps peer_get_caps ();
 		public Gst.Caps peer_get_caps_reffed ();
 		public bool peer_query (Gst.Query query);
-		[CCode (instance_pos = -1)]
-		public Gst.Caps proxy_getcaps (Gst.Pad pad);
-		[CCode (instance_pos = -1)]
+		public Gst.Caps proxy_getcaps ();
 		public bool proxy_setcaps (Gst.Caps caps);
 		public Gst.FlowReturn pull_range (uint64 offset, uint size, out Gst.Buffer buffer);
 		public Gst.FlowReturn push (owned Gst.Buffer buffer);
@@ -2265,7 +2262,7 @@ namespace Gst {
 		MISSING_PLUGIN,
 		CLOCK,
 		DISABLED,
-		NUM_ERRORS,
+		NUM_ERRORS
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate unowned Gst.Buffer BufferListDoFunction (Gst.Buffer buffer);
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 a88a6546a..fbf6fa727 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -227,11 +227,8 @@ namespace Gst {
 		public uint add_data_probe ([CCode (type="GCallback")] owned DataProbeCallback handler);
 		[CCode (cname = "gst_pad_add_event_probe_full")]
 		public uint add_event_probe ([CCode (type="GCallback")] owned EventProbeCallback handler);
-		[CCode (instance_pos = -1)]
-		public Gst.Caps get_fixed_caps_func (Gst.Pad pad);
-		[CCode (instance_pos = -1)]
-		public Gst.Caps proxy_getcaps (Gst.Pad pad);
-		[CCode (instance_pos = -1)]
+		public Gst.Caps get_fixed_caps_func ();
+		public Gst.Caps proxy_getcaps ();
 		public bool proxy_setcaps (Gst.Caps caps);
 		[CCode (cname = "gst_pad_set_blocked_async_full")]
 		public bool set_blocked_async (bool blocked, owned Gst.PadBlockCallback callback);