ext/esd/esdsink.c: Don't return bogus values when esd_get_delay() fails for some...

Original commit message from CVS:
* ext/esd/esdsink.c: (gst_esdsink_delay):
Don't return bogus values when esd_get_delay() fails for some
reason (#392189).

diff --git a/ChangeLog b/ChangeLog
index def3d79bf3d874fc80555ddc25355e9542cc898b..f9d827977597db7bc1561d55598f0f73be984151 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-04  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * ext/esd/esdsink.c: (gst_esdsink_delay):
+         Don't return bogus values when esd_get_delay() fails for some
+         reason (#392189).
+
 2006-12-24  Tim-Philipp Müller  <tim at centricular dot net>
 
        * sys/ximage/gstximagesrc.c: (composite_pixel):

diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index 7fdfafcaa8ee0b4717d11498fbc5cf361a60b050..3946b301dd275eed4ca9273161638948bb334ca3 100644 (file)
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -424,6 +424,11 @@ gst_esdsink_delay (GstAudioSink * asink)
 
   latency = esd_get_latency (esdsink->ctrl_fd);
 
+  if (latency == (guint) - 1) {
+    GST_WARNING_OBJECT (asink, "couldn't get latency");
+    return 0;
+  }
+
   /* latency is measured in samples at a rate of 44100, this 
    * cannot overflow. */
   latency = latency * G_GINT64_CONSTANT (44100) / esdsink->rate;