diff options
author | Luca Bruno <luca.bruno@immobiliare.it> | 2014-10-13 11:41:37 +0200 |
---|---|---|
committer | Luca Bruno <luca.bruno@immobiliare.it> | 2014-10-13 11:45:43 +0200 |
commit | d4d378caba87cbe03ff22f00e4090c3751f22537 (patch) | |
tree | 3c765796074e223cca5a4c5ada87adc1ad724027 | |
parent | 593a82c7207cebc5a1d568674c9eafe12eb9535a (diff) | |
download | vala-d4d378caba87cbe03ff22f00e4090c3751f22537.tar.gz |
gstreamer-1.0: remove owned to floating reference parameters
Commit 6296d34707 (bug 730983) added the owned
keyword back without any reason.
Fixes bug 738012
(cherry picked from commit afb3846cb9b89bc154d9d774dc500fb2bce55d7a)
-rw-r--r-- | vapi/gstreamer-1.0.vapi | 8 | ||||
-rw-r--r-- | vapi/metadata/Gst-1.0-custom.vala | 4 | ||||
-rw-r--r-- | vapi/metadata/Gst-1.0.metadata | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index 73a42c924..92909bdc5 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -540,10 +540,10 @@ namespace Gst { public bool state_dirty; [CCode (has_construct_function = false, returns_floating_reference = true, type = "GstElement*")] public Bin (string? name); - public bool add (owned Gst.Element element); + public bool add (Gst.Element element); [NoWrapper] public virtual bool add_element (Gst.Element element); - public void add_many (params owned Gst.Element[] elements); + public void add_many (params Gst.Element[] elements); public Gst.Pad? find_unlinked_pad (Gst.PadDirection direction); public Gst.Element get_by_interface (GLib.Type iface); public Gst.Element? get_by_name (string name); @@ -560,7 +560,7 @@ namespace Gst { public bool remove (Gst.Element element); [NoWrapper] public virtual bool remove_element (Gst.Element element); - public void remove_many (params owned Gst.Element[] elements); + public void remove_many (params Gst.Element[] elements); [NoAccessorMethod] public bool async_handling { get; set; } [NoAccessorMethod] @@ -1017,7 +1017,7 @@ namespace Gst { public void abort_state (); [CCode (cname = "gst_element_class_add_metadata")] public class void add_metadata (string key, string value); - public bool add_pad (owned Gst.Pad pad); + public bool add_pad (Gst.Pad pad); [CCode (cname = "gst_element_class_add_pad_template")] public class void add_pad_template (owned Gst.PadTemplate templ); [CCode (cname = "gst_element_class_add_static_metadata")] diff --git a/vapi/metadata/Gst-1.0-custom.vala b/vapi/metadata/Gst-1.0-custom.vala index eb057866c..2c7c38a19 100644 --- a/vapi/metadata/Gst-1.0-custom.vala +++ b/vapi/metadata/Gst-1.0-custom.vala @@ -5,8 +5,8 @@ namespace Gst { [CCode (type_id = "gst_bin_get_type ()")] public class Bin : Gst.Element { - public void add_many (params owned Gst.Element[] elements); - public void remove_many (params owned Gst.Element[] elements); + public void add_many (params Gst.Element[] elements); + public void remove_many (params Gst.Element[] elements); } [Compact, CCode (ref_function = "gst_buffer_ref", type_id = "gst_buffer_get_type ()", unref_function = "gst_buffer_unref")] diff --git a/vapi/metadata/Gst-1.0.metadata b/vapi/metadata/Gst-1.0.metadata index 1ce162dd7..ff7fb282c 100644 --- a/vapi/metadata/Gst-1.0.metadata +++ b/vapi/metadata/Gst-1.0.metadata @@ -37,11 +37,14 @@ init_get_option_group skip=false init.argv unowned init_check.argv unowned -// Floating references (bug #657202) +// Floating references (bug #657202 and bug #702969) Bin .new floating + .add.element owned=false BufferPool .new floating +Element + .add_pad.pad owned=false ElementFactory .create floating .make floating |