From e8e65fd0d53f91c2df7af1356b4252afd1a3213b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Sat, 21 Jun 2008 15:52:44 +0000 Subject: [PATCH] Fix GstStaticCaps and GstStaticPadTemplate bindings, fixes bug 539283 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-06-21 Jürg Billeter * vapi/packages/gstreamer-0.10/: Fix GstStaticCaps and GstStaticPadTemplate bindings, fixes bug 539283 * vapi/gstreamer-0.10.vapi: regenerated svn path=/trunk/; revision=1625 --- ChangeLog | 9 ++++++ vapi/gstreamer-0.10.vapi | 32 ++++++++++------------ .../gstreamer-0.10/gstreamer-0.10.metadata | 6 +++- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d332cd..938a688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2008-06-21 Jürg Billeter + * vapi/packages/gstreamer-0.10/: + + Fix GstStaticCaps and GstStaticPadTemplate bindings, + fixes bug 539283 + + * vapi/gstreamer-0.10.vapi: regenerated + +2008-06-21 Jürg Billeter + * gobject/valaccodegenerator.vala: Fix using static methods as delegates, fixes bug 539277 diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi index 84b040a..76c75b5 100644 --- a/vapi/gstreamer-0.10.vapi +++ b/vapi/gstreamer-0.10.vapi @@ -866,23 +866,6 @@ namespace Gst { public GLib.Quark quark; } [Compact] - [CCode (cheader_filename = "gst/gst.h")] - public class StaticCaps : Gst.Caps { - [CCode (cname = "string")] - public weak string str; - public weak Gst.Caps get (); - } - [Compact] - [CCode (cheader_filename = "gst/gst.h")] - public class StaticPadTemplate { - public weak string name_template; - public Gst.PadDirection direction; - public Gst.PadPresence presence; - public weak Gst.StaticCaps static_caps; - public weak Gst.PadTemplate get (); - public weak Gst.Caps get_caps (); - } - [Compact] [CCode (copy_function = "gst_tag_list_copy", cheader_filename = "gst/gst.h")] public class TagList { public void add (Gst.TagMergeMode mode, string tag); @@ -1831,6 +1814,21 @@ namespace Gst { public GLib.Quark quark; } [CCode (cheader_filename = "gst/gst.h")] + public struct StaticCaps { + [CCode (cname = "string")] + public weak string str; + public Gst.Caps get (); + } + [CCode (cheader_filename = "gst/gst.h")] + public struct StaticPadTemplate { + public weak string name_template; + public Gst.PadDirection direction; + public Gst.PadPresence presence; + public Gst.StaticCaps static_caps; + public Gst.PadTemplate get (); + public Gst.Caps get_caps (); + } + [CCode (cheader_filename = "gst/gst.h")] public delegate bool BusFunc (Gst.Bus bus, Gst.Message message); [CCode (cheader_filename = "gst/gst.h")] public delegate Gst.BusSyncReply BusSyncHandler (Gst.Bus bus, Gst.Message message); diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata index 741fe5d..8e3bbc7 100644 --- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata +++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata @@ -154,8 +154,12 @@ gst_query_parse_segment.rate is_out="1" gst_query_parse_segment.format is_out="1" gst_query_parse_segment.start_value is_out="1" gst_query_parse_segment.stop_value is_out="1" -GstStaticCaps base_class="GstCaps" +GstStaticCaps is_value_type="1" GstStaticCaps.caps hidden="1" +gst_static_caps_get transfer_ownership="1" +GstStaticPadTemplate is_value_type="1" +gst_static_pad_template_get transfer_ownership="1" +gst_static_pad_template_get_caps transfer_ownership="1" GstStructure is_immutable="1" gst_structure_new ellipsis="1" gst_structure_set ellipsis="1" -- 2.7.4