[pulseaudio-commits] r1903 - /branches/lennart/src/modules/module-combine.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Sep 25 01:53:58 2007
New Revision: 1903

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1903&root=pulseaudio&view=rev
Log:
fix suspending in module-combine.c

Modified:
    branches/lennart/src/modules/module-combine.c

Modified: branches/lennart/src/modules/module-combine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/module-combine.c?rev=1903&root=pulseaudio&r1=1902&r2=1903&view=diff
==============================================================================
--- branches/lennart/src/modules/module-combine.c (original)
+++ branches/lennart/src/modules/module-combine.c Tue Sep 25 01:53:58 2007
@@ -450,7 +450,7 @@
     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 @@
 
     /* 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) {
@@ -524,9 +527,6 @@
             o->sink_input = NULL;
         }
     }
-
-    if (pick_master(u, NULL) < 0)
-        pa_module_unload_request(u->module);
 
     pa_log_info("Device suspended...");