gstreamer-0.10: Fix Gst.Plugin and Gst.PluginFeature bindings

Some ownership issues, return/parameter type issues, etc.

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index d28a7641e2ab56d7f562a875459d7cc1163bc454..0229acbad91673bb5b1049059871a7f6415535de 100644 (file)
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -969,17 +969,8 @@ namespace Gst {
        }
        [CCode (cheader_filename = "gst/gst.h")]
        public class Plugin : Gst.Object {
-               public weak string basename;
-               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 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);
+               public void add_dependency ([CCode (array_length = false)] string?[] env_vars, [CCode (array_length = false)] string?[] paths, [CCode (array_length = false)] string?[] names, Gst.PluginDependencyFlags flags);
+               public void add_dependency_simple (string? env_vars, string? paths, string? names, Gst.PluginDependencyFlags flags);
                public static GLib.Quark error_quark ();
                public unowned Gst.Structure get_cache_data ();
                public unowned string get_description ();
@@ -992,30 +983,25 @@ namespace Gst {
                public unowned string get_source ();
                public unowned string get_version ();
                public bool is_loaded ();
-               public static void list_free (GLib.List list);
-               public unowned Gst.Plugin load ();
-               public static unowned Gst.Plugin load_by_name (string name);
-               public static unowned Gst.Plugin load_file (string filename) throws GLib.Error;
-               public bool name_filter (string name);
+               public Gst.Plugin? load ();
+               public static Gst.Plugin? load_by_name (string name);
+               public static Gst.Plugin? load_file (string filename) throws GLib.Error;
+               [CCode (instance_pos = -1)]
+               public bool name_filter (Gst.Plugin plugin, string name);
                public static bool register_static (int major_version, int minor_version, string name, string description, Gst.PluginInitFunc init_func, string version, string license, string source, string package, string origin);
                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);
+               public void set_cache_data (owned Gst.Structure cache_data);
        }
        [CCode (cheader_filename = "gst/gst.h")]
        public class PluginFeature : Gst.Object {
-               public bool loaded;
-               public weak string name;
-               public weak string plugin_name;
-               public uint rank;
                public bool check_version (uint min_major, uint min_minor, uint min_micro);
                public unowned string get_name ();
                public uint get_rank ();
-               public static unowned GLib.List list_copy (GLib.List list);
-               public static void list_free (GLib.List list);
-               public unowned Gst.PluginFeature load ();
+               public Gst.PluginFeature? load ();
                public void set_name (string name);
                public void set_rank (uint rank);
-               public bool type_name_filter (Gst.TypeNameData data);
+               [CCode (instance_pos = -1)]
+               public bool type_name_filter (Gst.PluginFeature feature, Gst.TypeNameData data);
        }
        [Compact]
        [CCode (cheader_filename = "gst/gst.h")]

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 ec06840a27cd774820cf91c898ac5f69c2e54f9e..aa57cc527c6ac380ea791f62594e9ecb7e7b6bf6 100644 (file)
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -494,4 +494,14 @@ namespace Gst {
                public weak string origin;
                void *_gst_reserved[];
        }
+
+       public class Plugin {
+               [CCode (instance_pos = -1)]
+               public bool name_filter (Gst.Plugin plugin, string name);
+       }
+
+       public class PluginFeature {
+               [CCode (instance_pos = -1)]
+               public bool type_name_filter (Gst.PluginFeature feature, Gst.TypeNameData data);
+       }
 }

diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index 4ffbf81ac2481e020ba69199bf6fb5d15d9df40c..279eb4b501c0fe4f257fbf60276bcb5836e64902 100644 (file)
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -619,3 +619,18 @@ GstTagSetterIFace hidden="1"
 gst_tag_setter_add_tag_values ellipsis="1"
 gst_tag_setter_add_tags ellipsis="1"
 GstPluginDesc hidden="1"
+GstPlugin.* hidden="1"
+gst_plugin_add_dependency.env_vars nullable="1" is_array="1" array_null_terminated="1"
+gst_plugin_add_dependency.paths nullable="1" is_array="1" array_null_terminated="1"
+gst_plugin_add_dependency.names nullable="1" is_array="1" array_null_terminated="1"
+gst_plugin_add_dependency_simple.env_vars nullable="1"
+gst_plugin_add_dependency_simple.paths nullable="1"
+gst_plugin_add_dependency_simple.names nullable="1"
+gst_plugin_set_cache_data.cache_data transfer_ownership="1"
+gst_plugin_name_filter hidden="1"
+gst_plugin_load* transfer_ownership="1" nullable="1"
+gst_*_list_free hidden="1"
+gst_*_list_copy hidden="1"
+GstPluginFeature.* hidden="1"
+gst_plugin_feature_type_name_filter hidden="1"
+gst_plugin_feature_load transfer_ownership="1" nullable="1"