diff options
author | Andy Wingo <wingo@pobox.com> | 2005-09-02 15:44:50 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2005-09-02 15:44:50 +0000 |
commit | 7ebd7b97d480d4047051c29ad5213791b7620f6c (patch) | |
tree | 7a4cfa3c197d393d6eb23d0fbac8bee97dc6d329 /ext/speex | |
parent | e6280d445d618272800e7bd39b9e83ba82d8a4bc (diff) |
All plugins updated for element state changes.
Original commit message from CVS:
2005-09-02 Andy Wingo <wingo@pobox.com>
* All plugins updated for element state changes.
Diffstat (limited to 'ext/speex')
-rw-r--r-- | ext/speex/gstspeexdec.c | 23 | ||||
-rw-r--r-- | ext/speex/gstspeexenc.c | 25 |
2 files changed, 25 insertions, 23 deletions
diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c index e1ec60cb..46c0981f 100644 --- a/ext/speex/gstspeexdec.c +++ b/ext/speex/gstspeexdec.c @@ -65,7 +65,8 @@ GST_BOILERPLATE (GstSpeexDec, gst_speex_dec, GstElement, GST_TYPE_ELEMENT); static gboolean speex_dec_event (GstPad * pad, GstEvent * event); static GstFlowReturn speex_dec_chain (GstPad * pad, GstBuffer * buf); -static GstElementStateReturn speex_dec_change_state (GstElement * element); +static GstStateChangeReturn speex_dec_change_state (GstElement * element, + GstStateChange transition); static gboolean speex_dec_src_event (GstPad * pad, GstEvent * event); static gboolean speex_dec_src_query (GstPad * pad, GstQuery * query); @@ -530,29 +531,29 @@ gst_speexdec_set_property (GObject * object, guint prop_id, } -static GstElementStateReturn -speex_dec_change_state (GstElement * element) +static GstStateChangeReturn +speex_dec_change_state (GstElement * element, GstStateChange transition) { GstSpeexDec *vd = GST_SPEEXDEC (element); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_NULL_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: break; - case GST_STATE_READY_TO_PAUSED: + case GST_STATE_CHANGE_READY_TO_PAUSED: break; - case GST_STATE_PAUSED_TO_PLAYING: + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: break; - case GST_STATE_PLAYING_TO_PAUSED: + case GST_STATE_CHANGE_PLAYING_TO_PAUSED: break; - case GST_STATE_PAUSED_TO_READY: + case GST_STATE_CHANGE_PAUSED_TO_READY: vd->packetno = 0; vd->samples_out = 0; break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: break; default: break; } - return parent_class->change_state (element); + return parent_class->change_state (element, transition); } diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index a1b1cd52..a4966fd7 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -104,7 +104,8 @@ static void gst_speexenc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void gst_speexenc_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static GstElementStateReturn gst_speexenc_change_state (GstElement * element); +static GstStateChangeReturn gst_speexenc_change_state (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -1057,35 +1058,35 @@ gst_speexenc_set_property (GObject * object, guint prop_id, } } -static GstElementStateReturn -gst_speexenc_change_state (GstElement * element) +static GstStateChangeReturn +gst_speexenc_change_state (GstElement * element, GstStateChange transition) { GstSpeexEnc *speexenc = GST_SPEEXENC (element); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_NULL_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: break; - case GST_STATE_READY_TO_PAUSED: + case GST_STATE_CHANGE_READY_TO_PAUSED: speexenc->eos = FALSE; speexenc->frameno = 0; speexenc->samples_in = 0; break; - case GST_STATE_PAUSED_TO_PLAYING: - case GST_STATE_PLAYING_TO_PAUSED: + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: + case GST_STATE_CHANGE_PLAYING_TO_PAUSED: break; - case GST_STATE_PAUSED_TO_READY: + case GST_STATE_CHANGE_PAUSED_TO_READY: speexenc->setup = FALSE; speexenc->header_sent = FALSE; gst_tag_list_free (speexenc->tags); speexenc->tags = gst_tag_list_new (); break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: default: break; } if (GST_ELEMENT_CLASS (parent_class)->change_state) - return GST_ELEMENT_CLASS (parent_class)->change_state (element); + return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } |