summaryrefslogtreecommitdiffstats
path: root/src/modules/module-oss.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-06-21 17:44:14 +0200
committerLennart Poettering <lennart@poettering.net>2008-06-21 17:44:14 +0200
commitab93f2a087e967a5931c5062a6aadf1438f2781b (patch)
tree40af8fb2d6b1e58d920985277ff928bda01f247f /src/modules/module-oss.c
parent2199b8e1adb3e9395e629da6a3b180d5e1ba15f0 (diff)
fix deadlock when resuming oss sinks
Diffstat (limited to 'src/modules/module-oss.c')
-rw-r--r--src/modules/module-oss.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 21b67379..76b13ecc 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...");