diff options
author | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-05 17:20:29 +0000 |
---|---|---|
committer | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-05 17:20:29 +0000 |
commit | 012dfb8b33969b582f9132ac9f95402b3098ff43 (patch) | |
tree | acff4df23e44c9d15abab2b9877c3f72032da286 /sys/dxr3 | |
parent | 390621f8de27467709897c92e5fec4605d96be75 (diff) | |
download | gstreamer-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.tar.gz |
Fix up all the state change functions.
Original commit message from CVS:
Fix up all the state change functions.
Diffstat (limited to 'sys/dxr3')
-rw-r--r-- | sys/dxr3/dxr3audiosink.c | 16 | ||||
-rw-r--r-- | sys/dxr3/dxr3spusink.c | 29 | ||||
-rw-r--r-- | sys/dxr3/dxr3videosink.c | 30 |
3 files changed, 40 insertions, 35 deletions
diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c index 144e50c11..2e7026f9d 100644 --- a/sys/dxr3/dxr3audiosink.c +++ b/sys/dxr3/dxr3audiosink.c @@ -118,7 +118,8 @@ static void dxr3audiosink_chain_ac3 (GstPad * pad, GstData * buf); /* static int dxr3audiosink_mvcommand (Dxr3AudioSink *sink, */ /* int command); */ -static GstElementStateReturn dxr3audiosink_change_state (GstElement * element); +static GstStateChangeReturn dxr3audiosink_change_state (GstElement * element, + GstStateChange transition); static void dxr3audiosink_flushed (Dxr3AudioSink * sink); @@ -701,10 +702,11 @@ dxr3audiosink_mvcommand (Dxr3AudioSink * sink, int command) } #endif -static GstElementStateReturn -dxr3audiosink_change_state (GstElement * element) +static GstStateChangeReturn +dxr3audiosink_change_state (GstElement * element, GstStateChange transition) { - g_return_val_if_fail (GST_IS_DXR3AUDIOSINK (element), GST_STATE_FAILURE); + g_return_val_if_fail (GST_IS_DXR3AUDIOSINK (element), + GST_STATE_CHANGE_FAILURE); if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) { @@ -713,16 +715,16 @@ dxr3audiosink_change_state (GstElement * element) } else { if (!GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) { if (!dxr3audiosink_open (DXR3AUDIOSINK (element))) { - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; } } } 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; } diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c index 023631d2e..badc2e41e 100644 --- a/sys/dxr3/dxr3spusink.c +++ b/sys/dxr3/dxr3spusink.c @@ -87,7 +87,8 @@ static void dxr3spusink_set_clock (GstElement * element, GstClock * clock); static gboolean dxr3spusink_handle_event (GstPad * pad, GstEvent * event); static void dxr3spusink_chain (GstPad * pad, GstData * _data); -static GstElementStateReturn dxr3spusink_change_state (GstElement * element); +static GstStateChangeReturn dxr3spusink_change_state (GstElement * element, + GstStateChange transition); /* static void dxr3spusink_wait (Dxr3SpuSink *sink, */ /* GstClockTime time); */ @@ -397,28 +398,28 @@ dxr3spusink_chain (GstPad * pad, GstData * _data) } -static GstElementStateReturn -dxr3spusink_change_state (GstElement * element) +static GstStateChangeReturn +dxr3spusink_change_state (GstElement * element, GstStateChange transition) { - g_return_val_if_fail (GST_IS_DXR3SPUSINK (element), GST_STATE_FAILURE); + g_return_val_if_fail (GST_IS_DXR3SPUSINK (element), GST_STATE_CHANGE_FAILURE); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_NULL_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: if (!GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) { if (!dxr3spusink_open (DXR3SPUSINK (element))) { - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; } } 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: break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: if (GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) { dxr3spusink_close (DXR3SPUSINK (element)); } @@ -426,10 +427,10 @@ dxr3spusink_change_state (GstElement * element) } 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; } #if 0 diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c index 37e28192a..c2222e85c 100644 --- a/sys/dxr3/dxr3videosink.c +++ b/sys/dxr3/dxr3videosink.c @@ -117,7 +117,8 @@ static void dxr3videosink_parse_data (Dxr3VideoSink * sink); static gboolean dxr3videosink_handle_event (GstPad * pad, GstEvent * event); static void dxr3videosink_chain (GstPad * pad, GstData * _data); -static GstElementStateReturn dxr3videosink_change_state (GstElement * element); +static GstStateChangeReturn dxr3videosink_change_state (GstElement * element, + GstStateChange transition); /* static void dxr3videosink_wait (Dxr3VideoSink *sink, */ /* GstClockTime time); */ @@ -633,32 +634,33 @@ dxr3videosink_chain (GstPad * pad, GstData * _data) } -static GstElementStateReturn -dxr3videosink_change_state (GstElement * element) +static GstStateChangeReturn +dxr3videosink_change_state (GstElement * element, GstStateChange transition) { - g_return_val_if_fail (GST_IS_DXR3VIDEOSINK (element), GST_STATE_FAILURE); + g_return_val_if_fail (GST_IS_DXR3VIDEOSINK (element), + GST_STATE_CHANGE_FAILURE); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_NULL_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: if (!GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) { if (!dxr3videosink_open (DXR3VIDEOSINK (element))) { - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; } } break; - case GST_STATE_READY_TO_PAUSED: + case GST_STATE_CHANGE_READY_TO_PAUSED: dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_PAUSE); break; - case GST_STATE_PAUSED_TO_PLAYING: + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_START); break; - case GST_STATE_PLAYING_TO_PAUSED: + case GST_STATE_CHANGE_PLAYING_TO_PAUSED: dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_PAUSE); break; - case GST_STATE_PAUSED_TO_READY: + case GST_STATE_CHANGE_PAUSED_TO_READY: dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_STOP); break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: if (GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) { dxr3videosink_close (DXR3VIDEOSINK (element)); } @@ -666,10 +668,10 @@ dxr3videosink_change_state (GstElement * element) } 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; } #if 0 |