[vlc-commits] PulseAudio: don't print an error when latency returns no data

[Rémi Denis-Courmont]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug 10 22:44:16 2011 +0300| [0d5a7d4b5bb56a0cdcf2ce395cb8660fe6c9b7e0] | committer: Rémi Denis-Courmont

PulseAudio: don't print an error when latency returns no data

This happens almost all the time, and is unfortunately normal behavior.
(cherry picked from commit e51fad4ca63581c99a4e7dd663e04e0f5be18d58)

Conflicts:

	modules/audio_output/pulse.c

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=0d5a7d4b5bb56a0cdcf2ce395cb8660fe6c9b7e0
---

 modules/audio_output/pulse.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index bbc8575..0225003 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -103,7 +103,8 @@ static mtime_t vlc_pa_get_latency(aout_instance_t *aout,
     int negative;
 
     if (pa_stream_get_latency(s, &latency, &negative)) {
-        error(aout, "unknown latency", ctx);
+        if (pa_context_errno (ctx) != PA_ERR_NODATA)
+            error(aout, "unknown latency", ctx);
         return VLC_TS_INVALID;
     }
     return negative ? -latency : +latency;