]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
gstreamer-0.10: Gst.PluginDesc is a structure
authorSandino Flores <tigrux@gmail.com>
Tue, 16 Feb 2010 04:37:15 +0000 (22:37 -0600)
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Tue, 16 Feb 2010 15:17:41 +0000 (17:17 +0200)
Gst.PluginDesc must be binded as structure and not a class.

Fixes bug 610065

vapi/gstreamer-0.10.vapi
vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata

index bf6677072d26161d39a2dc34100f06eb59d123b9..d0640817222554353f483bb84f4960d7ea1d042b 100644 (file)
@@ -954,13 +954,13 @@ namespace Gst {
        [CCode (cheader_filename = "gst/gst.h")]
        public class Plugin : Gst.Object {
                public weak string basename;
-               public weak Gst.PluginDesc desc;
+               public Gst.PluginDesc desc;
                public ulong file_mtime;
                public int64 file_size;
                public weak string filename;
                public uint flags;
                public weak GLib.Module module;
-               public weak Gst.PluginDesc orig_desc;
+               public Gst.PluginDesc orig_desc;
                public bool registered;
                public void add_dependency (string env_vars, string paths, string names, Gst.PluginDependencyFlags flags);
                public void add_dependency_simple (string env_vars, string paths, string names, Gst.PluginDependencyFlags flags);
@@ -985,20 +985,6 @@ namespace Gst {
                public static bool register_static_full (int major_version, int minor_version, string name, string description, Gst.PluginInitFullFunc init_full_func, string version, string license, string source, string package, string origin);
                public void set_cache_data (Gst.Structure cache_data);
        }
-       [Compact]
-       [CCode (cheader_filename = "gst/gst.h")]
-       public class PluginDesc {
-               public weak string description;
-               public weak string license;
-               public int major_version;
-               public int minor_version;
-               public weak string name;
-               public weak string origin;
-               public weak string package;
-               public weak Gst.PluginInitFunc plugin_init;
-               public weak string source;
-               public weak string version;
-       }
        [CCode (cheader_filename = "gst/gst.h")]
        public class PluginFeature : Gst.Object {
                public bool loaded;
@@ -1538,6 +1524,20 @@ namespace Gst {
        [CCode (type_id = "GST_TYPE_LIST", cheader_filename = "gst/gst.h")]
        public struct List {
        }
+       [CCode (type_id = "GST_TYPE_PLUGIN_DESC", cheader_filename = "gst/gst.h")]
+       public struct PluginDesc {
+               public int major_version;
+               public int minor_version;
+               public weak string name;
+               public weak string description;
+               public weak Gst.PluginInitFunc plugin_init;
+               public weak string version;
+               public weak string license;
+               public weak string source;
+               public weak string package;
+               public weak string origin;
+               public weak void*[] _gst_reserved;
+       }
        [CCode (type_id = "GST_TYPE_STATIC_CAPS", cheader_filename = "gst/gst.h")]
        public struct StaticCaps {
                [CCode (cname = "string")]
index ca2cf2253af4ebc9f656f9db0f7c2d0da0dcccfb..f213aba4fe2b8ab957baecc4edb0ea6e1002cba6 100644 (file)
@@ -250,4 +250,19 @@ namespace Gst {
                public bool parse_file(string fname, string root);
                public unowned Element get_element(string name);
        }
+
+       [CCode (cheader_filename = "gst/gst.h")]
+       public struct PluginDesc {
+               public int major_version;
+               public int minor_version;
+               public weak string name;
+               public weak string description;
+               public weak Gst.PluginInitFunc plugin_init;
+               public weak string version;
+               public weak string license;
+               public weak string source;
+               public weak string package;
+               public weak string origin;
+               void *_gst_reserved[];
+       }
 }
index d47e1e8cbd63ed3d79907c5cb7a5826dcc69379b..a92931add31b83a7aea59c1dd4c7723604891444 100644 (file)
@@ -414,3 +414,4 @@ GstBufferListClass hidden="1"
 GstTagSetterIFace hidden="1"
 gst_tag_setter_add_tag_values ellipsis="1"
 gst_tag_setter_add_tags ellipsis="1"
+GstPluginDesc hidden="1"