configure.ac: We require 0.10.10.1 now because of _wait_preroll().

Original commit message from CVS:
* configure.ac:
We require 0.10.10.1 now because of _wait_preroll().
* gst-libs/gst/audio/gstbaseaudiosink.c:
(gst_base_audio_sink_render):
Use gst_base_sink_wait_preroll().

diff --git a/ChangeLog b/ChangeLog
index 910b571..f64bae3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2006-09-15  Wim Taymans  <wim@fluendo.com>
 
+       * configure.ac:
+       We require 0.10.10.1 now because of _wait_preroll().
+
+       * gst-libs/gst/audio/gstbaseaudiosink.c:
+       (gst_base_audio_sink_render):
+       Use gst_base_sink_wait_preroll().
+
+2006-09-15  Wim Taymans  <wim@fluendo.com>
+
        * ext/alsa/gstalsasink.c: (xrun_recovery), (gst_alsasink_write):
        * ext/alsa/gstalsasrc.c: (xrun_recovery), (gst_alsasrc_read):
        Use DEBUG_OBJECT more.

diff --git a/configure.ac b/configure.ac
index 4e85dfc..14cff5f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ dnl AS_LIBTOOL_TAGS
 AM_PROG_LIBTOOL
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.10.9.1
+GST_REQ=0.10.10.1
 
 dnl *** autotools stuff ****
 

diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
index 07a386a..c946310 100644 (file)
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstbaseaudiosink.c
@@ -640,15 +640,9 @@ no_sync:
     if (written == samples)
       break;
 
-    /* else something interrupted us */
-    GST_DEBUG_OBJECT (sink, "wait for preroll...");
-    bsink->have_preroll = TRUE;
-    GST_PAD_PREROLL_WAIT (bsink->sinkpad);
-    bsink->have_preroll = FALSE;
-    GST_DEBUG_OBJECT (sink, "preroll done");
-    if (G_UNLIKELY (bsink->flushing))
+    /* else something interrupted us and we wait for preroll. */
+    if (gst_base_sink_wait_preroll (bsink) != GST_FLOW_OK)
       goto stopping;
-    GST_DEBUG_OBJECT (sink, "continue after preroll");
 
     render_offset += written;
     samples -= written;