[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. ab93f2a087e967a5931c5062a6aadf1438f2781b

[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  2199b8e1adb3e9395e629da6a3b180d5e1ba15f0 (commit)

- Log -----------------------------------------------------------------
ab93f2a... fix deadlock when resuming oss sinks
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-oss.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

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

commit ab93f2a087e967a5931c5062a6aadf1438f2781b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Jun 21 17:44:14 2008 +0200

    fix deadlock when resuming oss sinks

diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 21b6737..76b13ec 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -508,6 +508,9 @@ static int suspend(struct userdata *u) {
     return 0;
 }
 
+static int sink_get_volume(pa_sink *s);
+static int source_get_volume(pa_source *s);
+
 static int unsuspend(struct userdata *u) {
     int m;
     pa_sample_spec ss, *ss_original;
@@ -598,9 +601,9 @@ static int unsuspend(struct userdata *u) {
     build_pollfd(u);
 
     if (u->sink)
-        pa_sink_get_volume(u->sink);
+        sink_get_volume(u->sink);
     if (u->source)
-        pa_source_get_volume(u->source);
+        source_get_volume(u->source);
 
     pa_log_info("Resumed successfully...");
 

-- 
hooks/post-receive
PulseAudio Sound Server