From: Luca Bruno Date: Sun, 25 Nov 2012 20:09:19 +0000 (+0100) Subject: gstreamer-0.10: Fix Element.request_pad X-Git-Tag: 0.19.0~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94ed9b9cec4bec79688d17f360b6ac1e68e80316;p=thirdparty%2Fvala.git gstreamer-0.10: Fix Element.request_pad Based on patch by Marcin Lewandowski. Fixes bug 682208. --- diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi index 466d36b5f..d7d4b3ee0 100644 --- a/vapi/gstreamer-0.10.vapi +++ b/vapi/gstreamer-0.10.vapi @@ -472,7 +472,7 @@ namespace Gst { public virtual unowned Gst.Pad request_new_pad (Gst.PadTemplate templ, string? name); [NoWrapper] public virtual unowned Gst.Pad request_new_pad_full (Gst.PadTemplate templ, string name, Gst.Caps caps); - public unowned Gst.Pad request_pad (Gst.PadTemplate templ, string name, Gst.Caps caps); + public Gst.Pad? request_pad (Gst.PadTemplate templ, string? name, Gst.Caps? caps); public bool requires_clock (); public bool seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType cur_type, int64 cur, Gst.SeekType stop_type, int64 stop); public bool seek_simple (Gst.Format format, Gst.SeekFlags seek_flags, int64 seek_pos); @@ -2302,9 +2302,9 @@ namespace Gst { [CCode (cname = "GST_STATE_TRANSITION")] public static Gst.StateChange transition (Gst.State cur, Gst.State next); [CCode (cname = "GST_STATE_TRANSITION_CURRENT")] - public static Gst.State transition_current (); + public Gst.State transition_current (); [CCode (cname = "GST_STATE_TRANSITION_NEXT")] - public static Gst.State transition_next (); + public Gst.State transition_next (); } [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STATE_CHANGE_")] public enum StateChangeReturn { diff --git a/vapi/gstreamer-rtsp-server-1.0.vapi b/vapi/gstreamer-rtsp-server-1.0.vapi index 46c58d604..a0a3cb1a8 100644 --- a/vapi/gstreamer-rtsp-server-1.0.vapi +++ b/vapi/gstreamer-rtsp-server-1.0.vapi @@ -1,4 +1,4 @@ -/* gstreamer-rtsp-server-1.0.vapi generated by lt-vapigen, do not modify. */ +/* gstreamer-rtsp-server-1.0.vapi generated by vapigen, do not modify. */ [CCode (cprefix = "Gst", gir_namespace = "GstRtspServer", gir_version = "1.0", lower_case_cprefix = "gst_")] namespace Gst { diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata index 60a429077..753671762 100644 --- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata +++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata @@ -141,6 +141,9 @@ gst_element_make_from_uri hidden="1" gst_element_get_static_pad transfer_ownership="1" nullable="1" gst_element_get_pad transfer_ownership="1" nullable="1" gst_element_get_request_pad transfer_ownership="1" nullable="1" +gst_element_request_pad transfer_ownership="1" nullable="1" +gst_element_request_pad.name nullable="1" +gst_element_request_pad.caps nullable="1" gst_element_get_compatible_pad transfer_ownership="1" nullable="1" gst_element_get_compatible_pad_template nullable="1" gst_element_class_get_pad_template nullable="1"