[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.16-test3-16-g9b2534b

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  3e2ab9b22ed95bab3c69b1ea32cf2b8449fe3427 (commit)

- Log -----------------------------------------------------------------
9b2534b alsa: properly treat ESTRPIPE as system suspend
-----------------------------------------------------------------------

Summary of changes:
 src/modules/alsa/alsa-sink.c   |    4 ++--
 src/modules/alsa/alsa-source.c |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------

commit 9b2534b6d0667589f69bf36702f9b998841d3d80
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 4 00:23:43 2009 +0200

    alsa: properly treat ESTRPIPE as system suspend

diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 2a734e3..1c38430 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -340,8 +340,8 @@ static int try_recover(struct userdata *u, const char *call, int err) {
     if (err == -EPIPE)
         pa_log_debug("%s: Buffer underrun!", call);
 
-    if (err == -EBADFD)
-        pa_log_debug("%s: Stream suspended!", call);
+    if (err == -ESTRPIPE)
+        pa_log_debug("%s: System suspended!", call);
 
     if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
         pa_log("%s: %s", call, pa_alsa_strerror(err));
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index ed9c148..9a51f85 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -333,6 +333,9 @@ static int try_recover(struct userdata *u, const char *call, int err) {
     if (err == -EPIPE)
         pa_log_debug("%s: Buffer overrun!", call);
 
+    if (err == -ESTRPIPE)
+        pa_log_debug("%s: System suspended!", call);
+
     if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
         pa_log("%s: %s", call, pa_alsa_strerror(err));
         return -1;

-- 
hooks/post-receive
PulseAudio Sound Server