diff options
author | Jan Schmidt <thaytan@mad.scientist.com> | 2007-05-25 10:23:49 +0000 |
---|---|---|
committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-05-25 10:23:49 +0000 |
commit | 465a740bbf5b569251ecfb4d4ebd301b0120b2ca (patch) | |
tree | 78783546dafc43d58eeda9fcb13b84ef062f7399 | |
parent | d2977ff4eba46efb99930f89614c1105a2ebc1af (diff) |
gst/autodetect/gstautoaudiosink.c: Don't unnecessarily perform a READY->NULL->READY transition on the detected audio ...
Original commit message from CVS:
* gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_detect):
Don't unnecessarily perform a READY->NULL->READY transition on the
detected audio sink when starting up. Fixes: #440127
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gst/autodetect/gstautoaudiosink.c | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2007-05-25 Jan Schmidt <thaytan@mad.scientist.com> + + * gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_detect): + Don't unnecessarily perform a READY->NULL->READY transition on the + detected audio sink when starting up. Fixes: #440127 + 2007-05-24 Tim-Philipp Müller <tim at centricular dot net> * ext/flac/gstflacenc.c: (gst_flac_enc_sink_setcaps), diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c index 3920a33d..c3dc052b 100644 --- a/gst/autodetect/gstautoaudiosink.c +++ b/gst/autodetect/gstautoaudiosink.c @@ -290,7 +290,12 @@ gst_auto_audio_sink_detect (GstAutoAudioSink * sink) } sink->kid = esink; - gst_element_set_state (sink->kid, GST_STATE (sink)); + /* Ensure the child is brought up to the right state to match the parent + * although it's currently always in READY and + * we're always doing NULL->READY. */ + if (GST_STATE (sink->kid) < GST_STATE (sink)) + gst_element_set_state (sink->kid, GST_STATE (sink)); + gst_bin_add (GST_BIN (sink), esink); /* attach ghost pad */ |