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/dv | |
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/dv')
-rw-r--r-- | ext/dv/gstdvdec.c | 25 | ||||
-rw-r--r-- | ext/dv/gstdvdemux.c | 25 |
2 files changed, 24 insertions, 26 deletions
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index 9c1db617..44c52ccf 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -115,7 +115,8 @@ GST_BOILERPLATE (GstDVDec, gst_dvdec, GstElement, GST_TYPE_ELEMENT); static gboolean gst_dvdec_sink_setcaps (GstPad * pad, GstCaps * caps); static GstFlowReturn gst_dvdec_chain (GstPad * pad, GstBuffer * buffer); -static GstElementStateReturn gst_dvdec_change_state (GstElement * element); +static GstStateChangeReturn gst_dvdec_change_state (GstElement * element, + GstStateChange transition); static void gst_dvdec_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); @@ -309,19 +310,17 @@ no_buffer: } } -static GstElementStateReturn -gst_dvdec_change_state (GstElement * element) +static GstStateChangeReturn +gst_dvdec_change_state (GstElement * element, GstStateChange transition) { GstDVDec *dvdec = GST_DVDEC (element); - GstElementStateReturn ret; - gint transition; + GstStateChangeReturn ret; - transition = GST_STATE_TRANSITION (element); switch (transition) { - case GST_STATE_NULL_TO_READY: + case GST_STATE_CHANGE_NULL_TO_READY: break; - case GST_STATE_READY_TO_PAUSED: + case GST_STATE_CHANGE_READY_TO_PAUSED: dvdec->decoder = dv_decoder_new (0, dvdec->clamp_luma, dvdec->clamp_chroma); dvdec->decoder->quality = qualities[dvdec->quality]; @@ -331,23 +330,23 @@ gst_dvdec_change_state (GstElement * element) */ /* dv_set_quality (dvdec->decoder, qualities [dvdec->quality]); */ break; - case GST_STATE_PAUSED_TO_PLAYING: + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: break; default: break; } - ret = parent_class->change_state (element); + ret = parent_class->change_state (element, transition); switch (transition) { - 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: dv_decoder_free (dvdec->decoder); dvdec->decoder = NULL; dvdec->headers_seen = FALSE; break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: break; default: break; diff --git a/ext/dv/gstdvdemux.c b/ext/dv/gstdvdemux.c index e74eb22e..8655f65d 100644 --- a/ext/dv/gstdvdemux.c +++ b/ext/dv/gstdvdemux.c @@ -130,7 +130,8 @@ static GstFlowReturn gst_dvdemux_flush (GstDVDemux * dvdemux); static GstFlowReturn gst_dvdemux_chain (GstPad * pad, GstBuffer * buffer); static gboolean gst_dvdemux_handle_sink_event (GstPad * pad, GstEvent * event); -static GstElementStateReturn gst_dvdemux_change_state (GstElement * element); +static GstStateChangeReturn gst_dvdemux_change_state (GstElement * element, + GstStateChange transition); static void @@ -955,21 +956,19 @@ gst_dvdemux_chain (GstPad * pad, GstBuffer * buffer) return ret; } -static GstElementStateReturn -gst_dvdemux_change_state (GstElement * element) +static GstStateChangeReturn +gst_dvdemux_change_state (GstElement * element, GstStateChange transition) { GstDVDemux *dvdemux = GST_DVDEMUX (element); - GstElementStateReturn ret; - gint transition; + GstStateChangeReturn ret; - transition = GST_STATE_TRANSITION (element); switch (transition) { - case GST_STATE_NULL_TO_READY: + case GST_STATE_CHANGE_NULL_TO_READY: if (!dvdemux->videosrcpad) gst_dvdemux_add_pads (dvdemux); break; - case GST_STATE_READY_TO_PAUSED: + case GST_STATE_CHANGE_READY_TO_PAUSED: dvdemux->decoder = dv_decoder_new (0, FALSE, FALSE); dvdemux->audio_offset = 0; dvdemux->video_offset = 0; @@ -977,23 +976,23 @@ gst_dvdemux_change_state (GstElement * element) dvdemux->found_header = FALSE; dvdemux->frame_len = -1; break; - case GST_STATE_PAUSED_TO_PLAYING: + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: break; default: break; } - ret = parent_class->change_state (element); + ret = parent_class->change_state (element, transition); switch (transition) { - 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: gst_adapter_clear (dvdemux->adapter); dv_decoder_free (dvdemux->decoder); dvdemux->decoder = NULL; break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: break; default: break; |