[pulseaudio-commits] 2 commits - src/modules src/pulsecore

[Arun Raghavan]

 src/modules/module-filter-apply.c      |    2 +-
 src/modules/module-switch-on-connect.c |    9 +++++++--
 src/pulsecore/mcalign.h                |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 112c300ae12e3878057e22dcba668e832b2b4a96
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Aug 24 14:01:27 2011 +0200

    Fix spelling sucess -> success
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/module-filter-apply.c b/src/modules/module-filter-apply.c
index bf5d0c5..2040812 100644
--- a/src/modules/module-filter-apply.c
+++ b/src/modules/module-filter-apply.c
@@ -219,7 +219,7 @@ static void move_object_for_filter(pa_object *o, struct filter* filter, pa_bool_
         pa_log_info("Failed to move %s for \"%s\" to <%s>.", is_sink_input ? "sink-input" : "source-output",
                     pa_strnull(pa_proplist_gets(pl, PA_PROP_APPLICATION_NAME)), name);
     else
-        pa_log_info("Sucessfully moved %s for \"%s\" to <%s>.", is_sink_input ? "sink-input" : "source-output",
+        pa_log_info("Successfully moved %s for \"%s\" to <%s>.", is_sink_input ? "sink-input" : "source-output",
                     pa_strnull(pa_proplist_gets(pl, PA_PROP_APPLICATION_NAME)), name);
 
     pa_proplist_unset(pl, PA_PROP_FILTER_APPLY_MOVING);
diff --git a/src/modules/module-switch-on-connect.c b/src/modules/module-switch-on-connect.c
index b1570b1..86eadd7 100644
--- a/src/modules/module-switch-on-connect.c
+++ b/src/modules/module-switch-on-connect.c
@@ -94,7 +94,7 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void*
             pa_log_info("Failed to move sink input %u \"%s\" to %s.", i->index,
                         pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), sink->name);
         else
-            pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index,
+            pa_log_info("Successfully moved sink input %u \"%s\" to %s.", i->index,
                         pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), sink->name);
     }
 
@@ -147,7 +147,7 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
             pa_log_info("Failed to move source output %u \"%s\" to %s.", o->index,
                         pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME)), source->name);
         else
-            pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index,
+            pa_log_info("Successfully moved source output %u \"%s\" to %s.", o->index,
                         pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME)), source->name);
     }
 
diff --git a/src/pulsecore/mcalign.h b/src/pulsecore/mcalign.h
index e82eb00..e897643 100644
--- a/src/pulsecore/mcalign.h
+++ b/src/pulsecore/mcalign.h
@@ -70,7 +70,7 @@ void pa_mcalign_free(pa_mcalign *m);
  * has to free the memchunk by himself. */
 void pa_mcalign_push(pa_mcalign *m, const pa_memchunk *c);
 
-/* Pop a new memchunk from the aligner. Returns 0 when sucessful,
+/* Pop a new memchunk from the aligner. Returns 0 when successful,
  * nonzero otherwise. */
 int pa_mcalign_pop(pa_mcalign *m, pa_memchunk *c);
 

commit b746e09448f64ec6f33f80be52fe8a5a4879660a
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Aug 24 14:01:00 2011 +0200

    switch-on-connect: Don't switch to a monitor source
    
    Buglink: http://bugs.launchpad.net/bugs/831675
    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 b121fd9..b1570b1 100644
--- a/src/modules/module-switch-on-connect.c
+++ b/src/modules/module-switch-on-connect.c
@@ -29,6 +29,7 @@
 #include <pulsecore/core.h>
 #include <pulsecore/sink-input.h>
 #include <pulsecore/source-output.h>
+#include <pulsecore/source.h>
 #include <pulsecore/modargs.h>
 #include <pulsecore/log.h>
 #include <pulsecore/namereg.h>
@@ -113,6 +114,10 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
     if (c->state != PA_CORE_RUNNING)
         return PA_HOOK_OK;
 
+    /* Don't switch to a monitoring source */
+    if (source->monitor_of)
+        return PA_HOOK_OK;
+
     /* Don't switch to any internal devices */
     if ((s = pa_proplist_gets(source->proplist, PA_PROP_DEVICE_BUS))) {
         if (pa_streq(s, "pci"))