From: Juerg Billeter Date: Fri, 23 May 2008 20:39:00 +0000 (+0000) Subject: Fix the newsegment virtual method in GstBaseSrc, move the X-Git-Tag: VALA_0_3_3~144 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70ae8e54be874dfbb241e62661d85fa622db32d9;p=thirdparty%2Fvala.git Fix the newsegment virtual method in GstBaseSrc, move the 2008-05-23 Juerg Billeter * vapi/packages/gstreamer-base-0.10/: Fix the newsegment virtual method in GstBaseSrc, move the GST_BASE_TRANSFORM_* constants to the GstBaseTransform class, fix weak fields in GstBase*, and hide the abidata fields, patch by Ali Sabil * vapi/gstreamer-base-0.10.vapi: regenerated svn path=/trunk/; revision=1414 --- diff --git a/ChangeLog b/ChangeLog index ccbc0b0c8..007f09af4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-05-23 Jürg Billeter + + * vapi/packages/gstreamer-base-0.10/: + + Fix the newsegment virtual method in GstBaseSrc, move the + GST_BASE_TRANSFORM_* constants to the GstBaseTransform class, + fix weak fields in GstBase*, and hide the abidata fields, + patch by Ali Sabil + + * vapi/gstreamer-base-0.10.vapi: regenerated + 2008-05-23 Jürg Billeter * vapi/packages/gstreamer-0.10/: diff --git a/vapi/gstreamer-base-0.10.vapi b/vapi/gstreamer-base-0.10.vapi index cf93e7c1e..fca42bd9b 100644 --- a/vapi/gstreamer-base-0.10.vapi +++ b/vapi/gstreamer-base-0.10.vapi @@ -7,14 +7,138 @@ namespace Gst { STARTED, FLAG_LAST } + [CCode (cheader_filename = "gst/gst.h")] + public class BaseSrc : Gst.Element { + public Gst.Pad srcpad; + public GLib.Mutex live_lock; + public GLib.Cond live_cond; + public bool live_running; + public bool can_activate_push; + public Gst.ActivateMode pad_mode; + public bool seekable; + public bool random_access; + public Gst.ClockID clock_id; + public Gst.ClockTime end_time; + public Gst.Segment segment; + public bool need_newsegment; + public uint64 offset; + public uint64 size; + public int num_buffers_left; + public void* data; + [NoWrapper] + public virtual bool newsegment (); + public BaseSrc (); + public bool get_do_timestamp (); + public bool is_live (); + public bool query_latency (bool live, out Gst.ClockTime min_latency, out Gst.ClockTime max_latency); + public void set_do_timestamp (bool timestamp); + public void set_format (Gst.Format format); + public void set_live (bool live); + public Gst.FlowReturn wait_playing (); + [NoWrapper] + public virtual bool check_get_range (); + [NoWrapper] + public virtual Gst.FlowReturn create (uint64 offset, uint size, out weak Gst.Buffer buf); + [NoWrapper] + public virtual bool do_seek (Gst.Segment segment); + [NoWrapper] + public virtual bool event (Gst.Event event); + [NoWrapper] + public virtual void fixate (Gst.Caps caps); + [NoWrapper] + public virtual weak Gst.Caps get_caps (); + [NoWrapper] + public virtual bool get_size (uint64 size); + [NoWrapper] + public virtual void get_times (Gst.Buffer buffer, out Gst.ClockTime start, out Gst.ClockTime end); + [NoWrapper] + public virtual bool is_seekable (); + [NoWrapper] + public virtual bool negotiate (); + [NoWrapper] + public virtual bool prepare_seek_segment (Gst.Event seek, Gst.Segment segment); + [NoWrapper] + public virtual bool query (Gst.Query query); + [NoWrapper] + public virtual bool set_caps (Gst.Caps caps); + [NoWrapper] + public virtual bool start (); + [NoWrapper] + public virtual bool stop (); + [NoWrapper] + public virtual bool unlock (); + [NoWrapper] + public virtual bool unlock_stop (); + [NoAccessorMethod] + public ulong blocksize { get; set; } + public bool do_timestamp { get; set; } + [NoAccessorMethod] + public int num_buffers { get; set; } + [NoAccessorMethod] + public bool typefind { get; set; } + } + [CCode (cheader_filename = "gst/gst.h")] + public class BaseTransform : Gst.Element { + public Gst.Pad sinkpad; + public Gst.Pad srcpad; + public bool passthrough; + public bool always_in_place; + public Gst.Caps cache_caps1; + public uint cache_caps1_size; + public Gst.Caps cache_caps2; + public uint cache_caps2_size; + public bool have_same_caps; + public bool delay_configure; + public bool pending_configure; + public bool negotiated; + public bool have_newsegment; + public Gst.Segment segment; + public GLib.Mutex transform_lock; + public const string SINK_NAME; + public const string SRC_NAME; + public BaseTransform (); + public bool is_in_place (); + public bool is_passthrough (); + public bool is_qos_enabled (); + public void set_gap_aware (bool gap_aware); + public void set_in_place (bool in_place); + public void set_passthrough (bool passthrough); + public void set_qos_enabled (bool enabled); + public void update_qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp); + [NoWrapper] + public virtual bool event (Gst.Event event); + [NoWrapper] + public virtual void fixate_caps (Gst.PadDirection direction, Gst.Caps caps, Gst.Caps othercaps); + [NoWrapper] + public virtual bool get_unit_size (Gst.Caps caps, uint size); + [NoWrapper] + public virtual Gst.FlowReturn prepare_output_buffer (Gst.Buffer input, int size, Gst.Caps caps, out weak Gst.Buffer buf); + [NoWrapper] + public virtual bool set_caps (Gst.Caps incaps, Gst.Caps outcaps); + [NoWrapper] + public virtual bool src_event (Gst.Event event); + [NoWrapper] + public virtual bool start (); + [NoWrapper] + public virtual bool stop (); + [NoWrapper] + public virtual Gst.FlowReturn transform (Gst.Buffer inbuf, Gst.Buffer outbuf); + [NoWrapper] + public virtual weak Gst.Caps transform_caps (Gst.PadDirection direction, Gst.Caps caps); + [NoWrapper] + public virtual Gst.FlowReturn transform_ip (Gst.Buffer buf); + [NoWrapper] + public virtual bool transform_size (Gst.PadDirection direction, Gst.Caps caps, uint size, Gst.Caps othercaps, uint othersize); + [NoAccessorMethod] + public bool qos { get; set; } + } [CCode (cheader_filename = "gst/base/gstcollectpads.h")] public class CollectData { public weak Gst.CollectPads collect; - public weak Gst.Pad pad; - public weak Gst.Buffer buffer; + public Gst.Pad pad; + public Gst.Buffer buffer; public uint pos; public weak Gst.Segment segment; - public void* abidata; } [CCode (cheader_filename = "gst/base/gstdataqueue.h")] public class DataQueueItem { @@ -22,7 +146,7 @@ namespace Gst { public uint size; public uint64 duration; public bool visible; - public GLib.DestroyNotify destroy; + public weak GLib.DestroyNotify destroy; } [CCode (cheader_filename = "gst/base/gstdataqueue.h")] public class DataQueueSize { @@ -52,12 +176,12 @@ namespace Gst { } [CCode (cheader_filename = "gst/base/gstbasesink.h")] public class BaseSink : Gst.Element { - public weak Gst.Pad sinkpad; + public Gst.Pad sinkpad; public Gst.ActivateMode pad_mode; public uint64 offset; public bool can_activate_pull; public bool can_activate_push; - public weak GLib.Queue preroll_queue; + public GLib.Queue preroll_queue; public int preroll_queue_max_len; public int preroll_queued; public int buffers_queued; @@ -68,25 +192,24 @@ namespace Gst { public bool have_preroll; public bool playing_async; public bool have_newsegment; - public weak Gst.Segment segment; - public weak Gst.ClockID clock_id; - public weak Gst.ClockTime end_time; + public Gst.Segment segment; + public Gst.ClockID clock_id; + public Gst.ClockTime end_time; public bool flushing; - public void* abidata; public weak Gst.Buffer get_last_buffer (); - public weak Gst.ClockTime get_latency (); + public Gst.ClockTime get_latency (); public int64 get_max_lateness (); public bool get_sync (); - public weak Gst.ClockTimeDiff get_ts_offset (); + public Gst.ClockTimeDiff get_ts_offset (); public bool is_async_enabled (); public bool is_qos_enabled (); - public bool query_latency (bool live, bool upstream_live, Gst.ClockTime min_latency, Gst.ClockTime max_latency); + public bool query_latency (bool live, bool upstream_live, out Gst.ClockTime min_latency, out Gst.ClockTime max_latency); public void set_async_enabled (bool enabled); public void set_max_lateness (int64 max_lateness); public void set_qos_enabled (bool enabled); public void set_sync (bool sync); public void set_ts_offset (Gst.ClockTimeDiff offset); - public Gst.FlowReturn wait_eos (Gst.ClockTime time, Gst.ClockTimeDiff jitter); + public Gst.FlowReturn wait_eos (Gst.ClockTime time, out Gst.ClockTimeDiff jitter); public Gst.FlowReturn wait_preroll (); [NoWrapper] public virtual bool activate_pull (bool active); @@ -101,7 +224,7 @@ namespace Gst { [NoWrapper] public virtual weak Gst.Caps get_caps (); [NoWrapper] - public virtual void get_times (Gst.Buffer buffer, Gst.ClockTime start, Gst.ClockTime end); + public virtual void get_times (Gst.Buffer buffer, out Gst.ClockTime start, out Gst.ClockTime end); [NoWrapper] public virtual Gst.FlowReturn preroll (Gst.Buffer buffer); [NoWrapper] @@ -117,150 +240,27 @@ namespace Gst { [NoWrapper] public virtual bool unlock_stop (); [NoAccessorMethod] - public weak bool async { get; set; } - public weak Gst.Buffer last_buffer { get; } - public weak int64 max_lateness { get; set; } + public bool async { get; set; } + public Gst.Buffer last_buffer { get; } + public int64 max_lateness { get; set; } [NoAccessorMethod] - public weak uint preroll_queue_len { get; set construct; } - [NoAccessorMethod] - public weak bool qos { get; set; } - public weak bool sync { get; set; } - public weak int64 ts_offset { get; set; } - } - [CCode (cheader_filename = "gst/base/gstbasesrc.h")] - public class BaseSrc : Gst.Element { - public weak Gst.Pad srcpad; - public weak GLib.Mutex live_lock; - public weak GLib.Cond live_cond; - public bool live_running; - public bool can_activate_push; - public Gst.ActivateMode pad_mode; - public bool seekable; - public bool random_access; - public weak Gst.ClockID clock_id; - public weak Gst.ClockTime end_time; - public weak Gst.Segment segment; - public bool need_newsegment; - public uint64 offset; - public uint64 size; - public int num_buffers_left; - public void* data; - public bool get_do_timestamp (); - public bool is_live (); - public bool query_latency (bool live, Gst.ClockTime min_latency, Gst.ClockTime max_latency); - public void set_do_timestamp (bool live); - public void set_format (Gst.Format format); - public void set_live (bool live); - public Gst.FlowReturn wait_playing (); - [NoWrapper] - public virtual bool check_get_range (); - [NoWrapper] - public virtual Gst.FlowReturn create (uint64 offset, uint size, out weak Gst.Buffer buf); - [NoWrapper] - public virtual bool do_seek (Gst.Segment segment); - [NoWrapper] - public virtual bool event (Gst.Event event); - [NoWrapper] - public virtual void fixate (Gst.Caps caps); - [NoWrapper] - public virtual weak Gst.Caps get_caps (); - [NoWrapper] - public virtual bool get_size (uint64 size); - [NoWrapper] - public virtual void get_times (Gst.Buffer buffer, Gst.ClockTime start, Gst.ClockTime end); - [NoWrapper] - public virtual bool is_seekable (); - [NoWrapper] - public virtual bool negotiate (); - [NoWrapper] - [CCode (cname = "gst_base_src_newsegment")] - public BaseSrc.newsegment (Gst.BaseSrc src); - [NoWrapper] - public virtual bool prepare_seek_segment (Gst.Event seek, Gst.Segment segment); - [NoWrapper] - public virtual bool query (Gst.Query query); - [NoWrapper] - public virtual bool set_caps (Gst.Caps caps); - [NoWrapper] - public virtual bool start (); - [NoWrapper] - public virtual bool stop (); - [NoWrapper] - public virtual bool unlock (); - [NoWrapper] - public virtual bool unlock_stop (); - [NoAccessorMethod] - public weak ulong blocksize { get; set; } - public weak bool do_timestamp { get; set; } - [NoAccessorMethod] - public weak int num_buffers { get; set; } - [NoAccessorMethod] - public weak bool typefind { get; set; } - } - [CCode (cheader_filename = "gst/base/gstbasetransform.h")] - public class BaseTransform : Gst.Element { - public weak Gst.Pad sinkpad; - public weak Gst.Pad srcpad; - public bool passthrough; - public bool always_in_place; - public weak Gst.Caps cache_caps1; - public uint cache_caps1_size; - public weak Gst.Caps cache_caps2; - public uint cache_caps2_size; - public bool have_same_caps; - public bool delay_configure; - public bool pending_configure; - public bool negotiated; - public bool have_newsegment; - public weak Gst.Segment segment; - public weak GLib.Mutex transform_lock; - public bool is_in_place (); - public bool is_passthrough (); - public bool is_qos_enabled (); - public void set_gap_aware (bool gap_aware); - public void set_in_place (bool in_place); - public void set_passthrough (bool passthrough); - public void set_qos_enabled (bool enabled); - public void update_qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp); - [NoWrapper] - public virtual bool event (Gst.Event event); - [NoWrapper] - public virtual void fixate_caps (Gst.PadDirection direction, Gst.Caps caps, Gst.Caps othercaps); - [NoWrapper] - public virtual bool get_unit_size (Gst.Caps caps, uint size); - [NoWrapper] - public virtual Gst.FlowReturn prepare_output_buffer (Gst.Buffer input, int size, Gst.Caps caps, out weak Gst.Buffer buf); - [NoWrapper] - public virtual bool set_caps (Gst.Caps incaps, Gst.Caps outcaps); - [NoWrapper] - public virtual bool src_event (Gst.Event event); - [NoWrapper] - public virtual bool start (); - [NoWrapper] - public virtual bool stop (); - [NoWrapper] - public virtual Gst.FlowReturn transform (Gst.Buffer inbuf, Gst.Buffer outbuf); - [NoWrapper] - public virtual weak Gst.Caps transform_caps (Gst.PadDirection direction, Gst.Caps caps); - [NoWrapper] - public virtual Gst.FlowReturn transform_ip (Gst.Buffer buf); - [NoWrapper] - public virtual bool transform_size (Gst.PadDirection direction, Gst.Caps caps, uint size, Gst.Caps othercaps, uint othersize); + public uint preroll_queue_len { get; set construct; } [NoAccessorMethod] - public weak bool qos { get; set; } + public bool qos { get; set; } + public bool sync { get; set; } + public int64 ts_offset { get; set; } } [CCode (cheader_filename = "gst/base/gstcollectpads.h")] public class CollectPads : Gst.Object { public weak GLib.SList data; public uint cookie; public weak GLib.Cond cond; - public Gst.CollectPadsFunction func; + public weak Gst.CollectPadsFunction func; public void* user_data; public uint numpads; public uint queuedpads; public uint eospads; public bool started; - public void* abidata; public weak Gst.CollectData add_pad (Gst.Pad pad, uint size); public weak Gst.CollectData add_pad_full (Gst.Pad pad, uint size, Gst.CollectDataDestroyNotify destroy_notify); public uint available (); @@ -272,17 +272,19 @@ namespace Gst { public weak Gst.Buffer peek (Gst.CollectData data); public weak Gst.Buffer pop (Gst.CollectData data); public uint read (Gst.CollectData data, uchar bytes, uint size); + public weak Gst.Buffer read_buffer (Gst.CollectData data, uint size); public bool remove_pad (Gst.Pad pad); public void set_flushing (bool flushing); public void set_function (Gst.CollectPadsFunction func); public void start (); public void stop (); + public weak Gst.Buffer take_buffer (Gst.CollectData data, uint size); } [CCode (cheader_filename = "gst/base/gstdataqueue.h")] public class DataQueue : GLib.Object { public weak GLib.Queue queue; public weak Gst.DataQueueSize cur_level; - public Gst.DataQueueCheckFullFunction checkfull; + public weak Gst.DataQueueCheckFullFunction checkfull; public void* checkdata; public weak GLib.Mutex qlock; public weak GLib.Cond item_add; @@ -299,11 +301,11 @@ namespace Gst { public bool push (Gst.DataQueueItem item); public void set_flushing (bool flushing); [NoAccessorMethod] - public weak uint current_level_bytes { get; } + public uint current_level_bytes { get; } [NoAccessorMethod] - public weak uint64 current_level_time { get; } + public uint64 current_level_time { get; } [NoAccessorMethod] - public weak uint current_level_visible { get; } + public uint current_level_visible { get; } public signal void empty (); public signal void full (); } @@ -320,8 +322,6 @@ namespace Gst { public static delegate bool DataQueueCheckFullFunction (Gst.DataQueue queue, uint visible, uint bytes, uint64 time, void* checkdata); [CCode (cheader_filename = "gst/base/gsttypefindhelper.h")] public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out weak Gst.Buffer buffer); - public const string BASE_TRANSFORM_SINK_NAME; - public const string BASE_TRANSFORM_SRC_NAME; [CCode (cheader_filename = "gst/gst.h")] public static weak Gst.Caps type_find_helper (Gst.Pad src, uint64 size); [CCode (cheader_filename = "gst/gst.h")] diff --git a/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10-custom.vala b/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10-custom.vala new file mode 100644 index 000000000..5c7ddb9d3 --- /dev/null +++ b/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10-custom.vala @@ -0,0 +1,34 @@ +/* gstreamer-base-0.10-custom.vala + * + * Copyright (C) 2008 Ali Sabil + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: + * Ali Sabil + */ + +namespace Gst { + public class BaseSrc { + [NoWrapper] + public virtual bool newsegment (); + } + public class BaseTransform { + [CCode (cname = "GST_BASE_TRANSFORM_SINK_NAME")] + public const string SINK_NAME; + [CCode (cname = "GST_BASE_TRANSFORM_SRC_NAME")] + public const string SRC_NAME; + } +} diff --git a/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.deps b/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.deps index 6ef619093..8d926c10a 100644 --- a/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.deps +++ b/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.deps @@ -1 +1,2 @@ gstreamer-0.10 +gmodule-2.0 diff --git a/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.gi b/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.gi index 7058b76e4..532eddb96 100644 --- a/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.gi +++ b/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.gi @@ -410,7 +410,7 @@ - + @@ -826,6 +826,14 @@ + + + + + + + + @@ -860,6 +868,14 @@ + + + + + + + + diff --git a/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.metadata b/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.metadata index c0e51a498..09cc16905 100644 --- a/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.metadata +++ b/vapi/packages/gstreamer-base-0.10/gstreamer-base-0.10.metadata @@ -1,16 +1,28 @@ Gst cprefix="Gst" lower_case_cprefix="gst_" cheader_filename="gst/gst.h" GstAdapter cheader_filename="gst/base/gstadapter.h" GstBaseSink cheader_filename="gst/base/gstbasesink.h" +GstBaseSink.* weak="0" +GstBaseSink.abidata hidden="1" GstBaseSrc cheader_filename="gst/base/gstbasesrc.h" +GstBaseSrc.* weak="0" +gst_base_src_newsegment hidden="1" GstBaseTransform cheader_filename="gst/base/gstbasetransform.h" +GstBaseTransform.* weak="0" +GST_BASE_TRANSFORM_SINK_NAME hidden="1" +GST_BASE_TRANSFORM_SRC_NAME hidden="1" GstCollectData cheader_filename="gst/base/gstcollectpads.h" +GstCollectData.pad weak="0" +GstCollectData.buffer weak="0" +GstCollectData.abidata hidden="1" GstCollectDataDestroyNotify cheader_filename="gst/base/gstcollectpads.h" GstCollectPads cheader_filename="gst/base/gstcollectpads.h" +GstCollectPads.abidata hidden="1" GstCollectPadsDestroyNotify cheader_filename="gst/base/gstcollectpads.h" GstDataQueue cheader_filename="gst/base/gstdataqueue.h" GstDataQueueCheckFullFunction cheader_filename="gst/base/gstdataqueue.h" GstDataQueueItem cheader_filename="gst/base/gstdataqueue.h" GstDataQueueSize cheader_filename="gst/base/gstdataqueue.h" GstPushSrc cheader_filename="gst/base/gstpushsrc.h" +GstPushSrc.* weak="0" GstTypeFindHelperGetRangeFunction cheader_filename="gst/base/gsttypefindhelper.h"