caps: Make sure that the empty constructor build an Empty caps

Moving the NewAny variant at the end of the nodes in the API definition
file.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=793054
This commit is contained in:
Thibault Saunier 2018-03-13 09:27:01 -03:00
parent b65093ab72
commit de989e1800
3 changed files with 18 additions and 12 deletions

View file

@ -391,20 +391,11 @@ namespace Gst {
public Caps(IntPtr raw) : base(raw) {} public Caps(IntPtr raw) : base(raw) {}
[DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gst_caps_new_any(); static extern IntPtr gst_caps_new_empty();
public Caps () public Caps ()
{ {
Raw = gst_caps_new_any(); Raw = gst_caps_new_empty();
}
[DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gst_caps_new_empty();
public static Caps NewEmpty()
{
Caps result = new Caps (gst_caps_new_empty());
return result;
} }
[DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
@ -417,6 +408,15 @@ namespace Gst {
GLib.Marshaller.Free (native_media_type); GLib.Marshaller.Free (native_media_type);
} }
[DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gst_caps_new_any();
public static Caps NewAny()
{
Caps result = new Caps (gst_caps_new_any());
return result;
}
// Internal representation of the wrapped structure ABI. // Internal representation of the wrapped structure ABI.
static GLib.AbiStruct _abi_info = null; static GLib.AbiStruct _abi_info = null;

View file

@ -6618,7 +6618,6 @@
<field cname="mini_object" access="public" writeable="true" readable="true" is_callback="false" name="MiniObject" type="GstMiniObject" hidden="true"> <field cname="mini_object" access="public" writeable="true" readable="true" is_callback="false" name="MiniObject" type="GstMiniObject" hidden="true">
<warning>missing glib:type-name</warning> <warning>missing glib:type-name</warning>
</field> </field>
<constructor cname="gst_caps_new_any" disable_void_ctor="" />
<constructor cname="gst_caps_new_empty" disable_void_ctor="" /> <constructor cname="gst_caps_new_empty" disable_void_ctor="" />
<constructor cname="gst_caps_new_empty_simple"> <constructor cname="gst_caps_new_empty_simple">
<parameters> <parameters>
@ -6912,6 +6911,7 @@
<parameter name="string" type="const-gchar*" /> <parameter name="string" type="const-gchar*" />
</parameters> </parameters>
</method> </method>
<constructor cname="gst_caps_new_any" disable_void_ctor="" />
</boxed> </boxed>
<boxed name="CapsFeatures" cname="GstCapsFeatures" opaque="false" hidden="false"> <boxed name="CapsFeatures" cname="GstCapsFeatures" opaque="false" hidden="false">
<method name="GetType" cname="gst_caps_features_get_type" shared="true"> <method name="GetType" cname="gst_caps_features_get_type" shared="true">

View file

@ -48,6 +48,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
<attr path="/api/namespace/boxed[@cname='GstRTSPMessage']" name="nohash">true</attr> --> <attr path="/api/namespace/boxed[@cname='GstRTSPMessage']" name="nohash">true</attr> -->
<attr path="/api/namespace/boxed[@cname='GstRTSPMessage']/field[@cname='body']" name="type">guint8*</attr> <attr path="/api/namespace/boxed[@cname='GstRTSPMessage']/field[@cname='body']" name="type">guint8*</attr>
<!-- GstCaps fixes -->
<remove-node path="/api/namespace/boxed[@cname='GstCaps']/constructor[@cname='gst_caps_new_any']"/>
<add-node path="/api/namespace/boxed[@cname='GstCaps']">
<constructor cname="gst_caps_new_any" disable_void_ctor="" />
</add-node>
<!-- Explicitly declare GstSample as a GstMiniObject (the opaque struct definition doesn't have GObject-Introspection <!-- Explicitly declare GstSample as a GstMiniObject (the opaque struct definition doesn't have GObject-Introspection
annotations) to get ref-counting to work. annotations) to get ref-counting to work.
--> -->