[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-130-g87c8132

[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  82c46f223823e8359ee2b788a83eac0ab82c912a (commit)

- Log -----------------------------------------------------------------
87c8132... increase suspend timeout to 5s so that it is always longer then the default tsched buffer size of 2s
530b95f... don't call snd_pcm_drain() when we suspend because that might take awfully long with our long buffer sizes these days
88130eb... add missing inclusion
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/caps.c                    |    1 +
 src/modules/module-alsa-sink.c       |    4 ++--
 src/modules/module-suspend-on-idle.c |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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

commit 88130eb9e64326810c486fee5a9cff3dd3903fb0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Oct 4 01:06:35 2008 +0200

    add missing inclusion

diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 25a09fd..707b532 100644
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -34,6 +34,7 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/core-error.h>
 #include <pulsecore/log.h>
+#include <pulsecore/core-util.h>
 
 #ifdef HAVE_SYS_CAPABILITY_H
 #include <sys/capability.h>

commit 530b95fec50b6b7fb0ff1fd1a4eb9e4123bb32a0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Oct 4 01:07:08 2008 +0200

    don't call snd_pcm_drain() when we suspend because that might take awfully long with our long buffer sizes these days

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 8f90774..be463bb 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -539,8 +539,8 @@ static int suspend(struct userdata *u) {
 
     pa_smoother_pause(u->smoother, pa_rtclock_usec());
 
-    /* Let's suspend */
-    snd_pcm_drain(u->pcm_handle);
+    /* Let's suspend -- we don't call snd_pcm_drain() here since that might
+     * take awfully long with our long buffer sizes today. */
     snd_pcm_close(u->pcm_handle);
     u->pcm_handle = NULL;
 

commit 87c8132ce3f58eb65e742f085b364850c40fbf6a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Oct 4 01:07:38 2008 +0200

    increase suspend timeout to 5s so that it is always longer then the default tsched buffer size of 2s

diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
index bc7c023..6cc28ec 100644
--- a/src/modules/module-suspend-on-idle.c
+++ b/src/modules/module-suspend-on-idle.c
@@ -337,7 +337,7 @@ static pa_hook_result_t device_state_changed_hook_cb(pa_core *c, pa_object *o, s
 int pa__init(pa_module*m) {
     pa_modargs *ma = NULL;
     struct userdata *u;
-    uint32_t timeout = 1;
+    uint32_t timeout = 5;
     uint32_t idx;
     pa_sink *sink;
     pa_source *source;

-- 
hooks/post-receive
PulseAudio Sound Server