From a876898f35bc60218afb368ebcf0b93a79e32617 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Thu, 23 Mar 2006 21:28:06 +0000 Subject: More state change function fixes. Original commit message from CVS: * ext/speex/gstspeexdec.c: (speex_dec_change_state): * gst/interleave/deinterleave.c: (deinterleave_change_state): * gst/interleave/interleave.c: (interleave_change_state): * gst/wavenc/gstwavenc.c: (gst_wavenc_change_state): More state change function fixes. --- gst/wavenc/gstwavenc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gst/wavenc') diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c index f392b6ee..6b2fb973 100644 --- a/gst/wavenc/gstwavenc.c +++ b/gst/wavenc/gstwavenc.c @@ -126,8 +126,13 @@ gst_wavenc_get_type (void) static GstStateChangeReturn gst_wavenc_change_state (GstElement * element, GstStateChange transition) { + GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; GstWavEnc *wavenc = GST_WAVENC (element); + ret = parent_class->change_state (element, transition); + if (ret != GST_STATE_CHANGE_SUCCESS) + return ret; + switch (transition) { case GST_STATE_CHANGE_PAUSED_TO_READY: wavenc->setup = FALSE; @@ -137,11 +142,7 @@ gst_wavenc_change_state (GstElement * element, GstStateChange transition) break; } - if (parent_class->change_state) { - return parent_class->change_state (element, transition); - } - - return GST_STATE_CHANGE_SUCCESS; + return ret; } static void -- cgit