[pulseaudio-commits] src/modules

Arun Raghavan arun at kemper.freedesktop.org
Wed Aug 31 06:23:04 PDT 2011


 src/modules/module-switch-on-connect.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7bba2464d4acd6e400703346d6f0813b83214bf
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Aug 31 14:37:05 2011 +0200

    module-switch-on-connect: Don't switch unlinked sink input and source outputs
    
    Unlinked streams can not be moved, so don't try.
    
    BugLink: http://bugs.launchpad.net/bugs/837386
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/module-switch-on-connect.c b/src/modules/module-switch-on-connect.c
index 86eadd7..efe1270 100644
--- a/src/modules/module-switch-on-connect.c
+++ b/src/modules/module-switch-on-connect.c
@@ -87,7 +87,7 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void*
     }
 
     PA_IDXSET_FOREACH(i, def->inputs, idx) {
-        if (i->save_sink)
+        if (i->save_sink || !PA_SINK_INPUT_IS_LINKED(i->state))
             continue;
 
         if (pa_sink_input_move_to(i, sink, FALSE) < 0)
@@ -140,7 +140,7 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
     }
 
     PA_IDXSET_FOREACH(o, def->outputs, idx) {
-        if (o->save_source)
+        if (o->save_source || !PA_SOURCE_OUTPUT_IS_LINKED(o->state))
             continue;
 
         if (pa_source_output_move_to(o, source, FALSE) < 0)



More information about the pulseaudio-commits mailing list