diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | gst/autodetect/gstautoaudiosink.c | 14 | ||||
-rw-r--r-- | gst/autodetect/gstautovideosink.c | 14 |
3 files changed, 31 insertions, 8 deletions
@@ -1,3 +1,14 @@ +2005-11-01 Tim-Philipp Müller <tim at centricular dot net> + + * gst/autodetect/gstautoaudiosink.c: + (gst_auto_audio_sink_class_init), + (gst_auto_audio_sink_change_state): + * gst/autodetect/gstautovideosink.c: + (gst_auto_video_sink_class_init), + (gst_auto_video_sink_change_state): + Fix state change function and use GST_DEBUG_FUNCPTR in + class_init. + 2005-11-01 Josef Zlomek <josef dot zlomek at xeris dot cz> Reviewed by: Tim-Philipp Müller <tim at centricular dot net> diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c index 334ae451..2becffcd 100644 --- a/gst/autodetect/gstautoaudiosink.c +++ b/gst/autodetect/gstautoaudiosink.c @@ -57,7 +57,7 @@ gst_auto_audio_sink_class_init (GstAutoAudioSinkClass * klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - eklass->change_state = gst_auto_audio_sink_change_state; + eklass->change_state = GST_DEBUG_FUNCPTR (gst_auto_audio_sink_change_state); } /* @@ -237,15 +237,21 @@ static GstStateChangeReturn gst_auto_audio_sink_change_state (GstElement * element, GstStateChange transition) { + GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; GstAutoAudioSink *sink = GST_AUTO_AUDIO_SINK (element); - GST_DEBUG_OBJECT (element, "Change state 0x%x", transition); - switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: if (!gst_auto_audio_sink_detect (sink)) return GST_STATE_CHANGE_FAILURE; break; + default: + break; + } + + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { case GST_STATE_CHANGE_READY_TO_NULL: gst_auto_audio_sink_reset (sink); break; @@ -253,5 +259,5 @@ gst_auto_audio_sink_change_state (GstElement * element, break; } - return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + return ret; } diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c index b4a861b9..b9dfda81 100644 --- a/gst/autodetect/gstautovideosink.c +++ b/gst/autodetect/gstautovideosink.c @@ -57,7 +57,7 @@ gst_auto_video_sink_class_init (GstAutoVideoSinkClass * klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - eklass->change_state = gst_auto_video_sink_change_state; + eklass->change_state = GST_DEBUG_FUNCPTR (gst_auto_video_sink_change_state); } /* @@ -205,15 +205,21 @@ static GstStateChangeReturn gst_auto_video_sink_change_state (GstElement * element, GstStateChange transition) { + GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; GstAutoVideoSink *sink = GST_AUTO_VIDEO_SINK (element); - GST_DEBUG_OBJECT (element, "Change state 0x%x", transition); - switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: if (!gst_auto_video_sink_detect (sink)) return GST_STATE_CHANGE_FAILURE; break; + default: + break; + } + + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { case GST_STATE_CHANGE_READY_TO_NULL: gst_auto_video_sink_reset (sink); break; @@ -221,5 +227,5 @@ gst_auto_video_sink_change_state (GstElement * element, break; } - return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + return ret; } |