From a0354a5b964c00ed97f540262dbad99b7893166c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 12 Jul 2006 13:24:19 +0000 Subject: [PATCH] gst-libs/gst/audio/gstbaseaudiosrc.c: Don't try to post an error message when setting the clock fails as this can hap... Original commit message from CVS: * gst-libs/gst/audio/gstbaseaudiosrc.c: (gst_base_audio_src_set_clock), (gst_base_audio_src_check_get_range), (gst_base_audio_src_create): Don't try to post an error message when setting the clock fails as this can happen when adding an element to a bin which will then deadlock. Fixes #347296. --- ChangeLog | 9 +++++++++ gst-libs/gst/audio/gstbaseaudiosrc.c | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce6c927a9a..5abd780cf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-07-12 Wim Taymans + + * gst-libs/gst/audio/gstbaseaudiosrc.c: + (gst_base_audio_src_set_clock), + (gst_base_audio_src_check_get_range), (gst_base_audio_src_create): + Don't try to post an error message when setting the clock fails + as this can happen when adding an element to a bin which will then + deadlock. Fixes #347296. + 2006-07-12 Edward Hervey * ext/vorbis/vorbisdec.c: (gst_vorbis_dec_reset), diff --git a/gst-libs/gst/audio/gstbaseaudiosrc.c b/gst-libs/gst/audio/gstbaseaudiosrc.c index 906ce5073e..d4275664a3 100644 --- a/gst-libs/gst/audio/gstbaseaudiosrc.c +++ b/gst-libs/gst/audio/gstbaseaudiosrc.c @@ -164,8 +164,9 @@ gst_base_audio_src_set_clock (GstElement * elem, GstClock * clock) /* ERRORS */ wrong_clock: { - GST_ELEMENT_ERROR (src, CORE, CLOCK, - (NULL), ("Cannot operate with this clock.")); + /* no error message, this method is called with the parent + * lock helt.. sigh.. long live recursive locks.. */ + GST_DEBUG_OBJECT (src, "Cannot operate with this clock."); return FALSE; } }