[pulseaudio-commits] 2 commits - src/modules

[Tanu Kaskinen]

 src/modules/alsa/mixer/paths/analog-output-headphones-2.conf |    4 ++++
 src/modules/alsa/mixer/paths/analog-output-headphones.conf   |    4 ++++
 src/modules/alsa/mixer/paths/analog-output-lineout.conf      |    4 ++++
 src/modules/module-zeroconf-discover.c                       |   11 +++++++++--
 4 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 4e5051db7297d8171d148ef7d15c2e06ebeff0ce
Author: Héctor Martín <hector at marcansoft.com>
Date:   Wed Jan 15 12:20:27 2014 +0200

    zeroconf-discover: Specify the interface when connecting to a link-local IPv6 address
    
    BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=40785

diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index 77782ad..2720103 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -149,6 +149,7 @@ static void resolver_cb(
     else {
         char *device = NULL, *dname, *module_name, *args;
         const char *t;
+        char *if_suffix = NULL;
         char at[AVAHI_ADDRESS_STR_MAX], cmt[PA_CHANNEL_MAP_SNPRINT_MAX];
         pa_sample_spec ss;
         pa_channel_map cm;
@@ -210,16 +211,21 @@ static void resolver_cb(
         }
 
         t = strstr(type, "sink") ? "sink" : "source";
+        if (a->proto == AVAHI_PROTO_INET6 &&
+            a->data.ipv6.address[0] == 0xfe &&
+            (a->data.ipv6.address[1] & 0xc0) == 0x80)
+            if_suffix = pa_sprintf_malloc("%%%d", interface);
 
         module_name = pa_sprintf_malloc("module-tunnel-%s", t);
-        args = pa_sprintf_malloc("server=[%s]:%u "
+        args = pa_sprintf_malloc("server=[%s%s]:%u "
                                  "%s=%s "
                                  "format=%s "
                                  "channels=%u "
                                  "rate=%u "
                                  "%s_name=%s "
                                  "channel_map=%s",
-                                 avahi_address_snprint(at, sizeof(at), a), port,
+                                 avahi_address_snprint(at, sizeof(at), a),
+                                 if_suffix ? if_suffix : "", port,
                                  t, device,
                                  pa_sample_format_to_string(ss.format),
                                  ss.channels,
@@ -238,6 +244,7 @@ static void resolver_cb(
         pa_xfree(module_name);
         pa_xfree(dname);
         pa_xfree(args);
+        pa_xfree(if_suffix);
         avahi_free(device);
     }
 

commit a0f73b74eba68ae919bb1201cf8994cb604c26bf
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Wed Jan 15 11:37:26 2014 +0200

    alsa: Mute "Bass Speaker" when using headphones or lineout
    
    BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=73604

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
index 7568924..74c467a 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -88,4 +88,8 @@ volume = off
 switch = off
 volume = off
 
+[Element Bass Speaker]
+switch = off
+volume = off
+
 .include analog-output.conf.common
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index b1a349a..89d794f 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -118,6 +118,10 @@ volume = off
 switch = off
 volume = off
 
+[Element Bass Speaker]
+switch = off
+volume = off
+
 [Element Speaker Front]
 switch = off
 volume = off
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index 3d0e7c2..d5e24b1 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -144,6 +144,10 @@ volume = merge
 override-map.1 = all-center
 override-map.2 = all-center,lfe
 
+[Element Bass Speaker]
+switch = off
+volume = off
+
 [Element Speaker Front]
 switch = off
 volume = off