gst-libs/gst/audio/gstbaseaudiosrc.c: Don't try to post an error message when setting...

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.

diff --git a/ChangeLog b/ChangeLog
index ce6c927..5abd780 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-12  Wim Taymans  <wim@fluendo.com>
+
+       * 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  <edward@fluendo.com>
 
        * 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 906ce50..d427566 100644 (file)
--- 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;
   }
 }