diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-09-24 23:53:58 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-09-24 23:53:58 +0000 |
| commit | 86ec4215928ae1ee0752406cf4f9fe2df77795d8 (patch) | |
| tree | ed5bed7f4baaef0032c1a22df2bd640a5011f0d8 | |
| parent | 609ad12f293eb0febebc7630c23a9978ce662211 (diff) | |
fix suspending in module-combine.c
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1903 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/modules/module-combine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c index 656cef92..d9c2af6d 100644 --- a/src/modules/module-combine.c +++ b/src/modules/module-combine.c @@ -450,7 +450,7 @@ static void sink_input_detach_cb(pa_sink_input *i) { pa_sink_input_assert_ref(i); pa_assert_se(o = i->userdata); - pa_log("detaching %s", i->sink->name); +/* pa_log("detaching %s", i->sink->name); */ pa_assert(o->inq_rtpoll_item); pa_rtpoll_item_free(o->inq_rtpoll_item); @@ -516,6 +516,9 @@ static int suspend(struct userdata *u) { /* Let's suspend by unlinking all streams */ + if (update_master(u, NULL) < 0) + pa_module_unload_request(u->module); + for (o = pa_idxset_first(u->outputs, &idx); o; o = pa_idxset_next(u->outputs, &idx)) { if (o->sink_input) { @@ -525,9 +528,6 @@ static int suspend(struct userdata *u) { } } - if (pick_master(u, NULL) < 0) - pa_module_unload_request(u->module); - pa_log_info("Device suspended..."); return 0; |