[pulseaudio-commits] 4 commits - src/daemon src/modules

[Colin Guthrie]

 src/daemon/default.pa.in                                   |    5 +++++
 src/daemon/main.c                                          |    2 +-
 src/modules/alsa/mixer/paths/analog-output-headphones.conf |    3 +++
 src/modules/alsa/mixer/paths/analog-output.conf            |    3 +++
 src/modules/alsa/mixer/paths/analog-output.conf.common     |    3 +++
 5 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 545521d405f15d47cc2e9d93f64a80d798a291cf
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon Aug 15 14:05:50 2011 +0200

    Remove offensive part of error message
    
    I don't know the exact cause for someone to submit a bug report for
    this error message: if someone is truly offended by it (if so it is
    a reminder that some people are more sensitive than others, and I do
    want those people to feel welcome as well), or if it's a system's
    check (if this goes through, it shows the system works, and the person
    might put more work into his/her next patch), or if it's just a bug
    (after all, it's not that weird to run two instances of PulseAudio?).
    Either one could be reason enough to apply IMO.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 1d0a65e..c620842 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -377,7 +377,7 @@ static pa_dbus_connection *register_dbus_name(pa_core *c, DBusBusType bus, const
     if (dbus_error_is_set(&error))
         pa_log_error("Failed to acquire %s: %s: %s", name, error.name, error.message);
     else
-        pa_log_error("D-Bus name %s already taken. Weird shit!", name);
+        pa_log_error("D-Bus name %s already taken.", name);
 
     /* PA cannot be started twice by the same user and hence we can
      * ignore mostly the case that a name is already taken. */

commit 286232f7a8f360654746e9f78505c358a98b1b79
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon Aug 15 14:05:49 2011 +0200

    JACK: Load module-jackdbus-detect in default.pa
    
    Provides automatic integration with the dbus enabled version of JACK 2.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index b9290dd..6155b31 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -79,6 +79,11 @@ load-module module-hal-detect
 load-module module-detect
 .endif
 
+### Automatically connect sink and source if JACK server is present
+.ifexists module-jackdbus-detect at PA_SOEXT@
+load-module module-jackdbus-detect
+.endif
+
 ifelse(@HAVE_BLUEZ@, 1, [dnl
 ### Automatically load driver modules for Bluetooth hardware
 .ifexists module-bluetooth-discover at PA_SOEXT@

commit 5c86d76554e43dfdba173e052257518493cd716e
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon Aug 15 14:05:48 2011 +0200

    alsa-mixer: Add "Line HP Swap" element
    
    The "Line HP Swap" element needs to be set correctly for some Dove
    boards to work correctly. Thanks to Daniel T Chen for the patch.
    
    BugLink: http://bugs.launchpad.net/bugs/451635
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 1d7bb0b..1d8d3fe 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -45,6 +45,9 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+[Element Line HP Swap]
+switch = on
+
 ; This profile path is intended to control the first headphones, not
 ; the second headphones. But it should not hurt if we leave the second
 ; headphone jack enabled nonetheless.
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
index 50fc88e..16dadc4 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf
+++ b/src/modules/alsa/mixer/paths/analog-output.conf
@@ -38,6 +38,9 @@ override-map.2 = all-left,all-right
 switch = off
 volume = off
 
+[Element Line HP Swap]
+switch = off
+
 ; This profile path is intended to control the default output, not the
 ; headphones. But it should not hurt if we leave the headphone jack
 ; enabled nonetheless.

commit 838672974ec35c9e9eea4f67a2e7206f5cf87c22
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon Aug 15 14:05:47 2011 +0200

    alsa-mixer: Mute IEC958 optical raw for several Audigy models
    
    This switch needs to be off for analog output to work on several
    Audigy cards.
    
    Thanks to Daniel T Chen for the patch.
    
    BugLink: http://bugs.launchpad.net/bugs/408370
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common
index ccaa494..db6b473 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-output.conf.common
@@ -129,6 +129,9 @@ priority = 0
 name = output-bass-boost-off
 priority = 10
 
+[Element IEC958 Optical Raw]
+switch = off
+
 ;;; 'Analog Output'
 
 [Element Analog Output]