]> code.delx.au - pulseaudio/commitdiff
fix deadlock when resuming oss sinks
authorLennart Poettering <lennart@poettering.net>
Sat, 21 Jun 2008 15:44:14 +0000 (17:44 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 21 Jun 2008 15:44:14 +0000 (17:44 +0200)
src/modules/module-oss.c

index 21b67379f3bff8808158487eff7a5d283a6d3b82..76b13ecc17b3aa45e9c7e6c335b1a8a1b94536f1 100644 (file)
@@ -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...");