diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2005-11-01 12:39:16 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2005-11-01 12:39:16 +0000 |
commit | 7448422fe23877056ce9822bef698283e77a56b1 (patch) | |
tree | 5526f479b642f73932a8e0f279dce6b34edd4892 /gst/autodetect/gstautovideosink.c | |
parent | 7d9dd13c6e11c0e8be2906b41d23103bf6a83200 (diff) |
gst/autodetect/: Fix state change function and use GST_DEBUG_FUNCPTR in class_init.
Original commit message from CVS:
* 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.
Diffstat (limited to 'gst/autodetect/gstautovideosink.c')
-rw-r--r-- | gst/autodetect/gstautovideosink.c | 14 |
1 files changed, 10 insertions, 4 deletions
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; } |