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

[David Henningsson]

 src/modules/alsa/mixer/profile-sets/default.conf                   |    7 +++++++
 src/modules/alsa/mixer/profile-sets/extra-hdmi.conf                |    7 +++++++
 src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf |    7 +++++++
 src/modules/alsa/mixer/profile-sets/force-speaker.conf             |    7 +++++++
 src/pulse/channelmap.c                                             |    6 ++++++
 5 files changed, 34 insertions(+)

New commits:
commit 3f140f9022ef0b59b3684edd25e2202a65989669
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri May 23 14:21:27 2014 +0200

    alsa-mixer: Add surround 2.1 profile
    
    Surround 2.1 is one of the more common surround profiles these days,
    so it's about time we support it.
    
    The "surround21" was added to alsa-lib a few months ago, and there
    hasn't yet been an alsa-lib release since, but I doubt it will change.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index 9326245..83cb425 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -112,6 +112,13 @@ paths-output = analog-output analog-output-lineout analog-output-speaker analog-
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
 priority = 10
 
+[Mapping analog-surround-21]
+device-strings = surround21:%f
+channel-map = front-left,front-right,lfe
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+priority = 8
+direction = output
+
 [Mapping analog-surround-40]
 device-strings = surround40:%f
 channel-map = front-left,front-right,rear-left,rear-right
diff --git a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
index 191a652..b1af2fa 100644
--- a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
+++ b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
@@ -38,6 +38,13 @@ paths-output = analog-output analog-output-lineout analog-output-speaker analog-
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
 priority = 10
 
+[Mapping analog-surround-21]
+device-strings = surround21:%f
+channel-map = front-left,front-right,lfe
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+priority = 8
+direction = output
+
 [Mapping analog-surround-40]
 device-strings = surround40:%f
 channel-map = front-left,front-right,rear-left,rear-right
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
index 66b18b3..c6bb6ca 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
@@ -35,6 +35,13 @@ paths-output = analog-output analog-output-lineout analog-output-speaker-always
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic-always analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
 priority = 10
 
+[Mapping analog-surround-21]
+device-strings = surround21:%f
+channel-map = front-left,front-right,lfe
+paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker
+priority = 8
+direction = output
+
 [Mapping analog-surround-40]
 device-strings = surround40:%f
 channel-map = front-left,front-right,rear-left,rear-right
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker.conf b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
index 7c5c1b8..8acb67c 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
@@ -34,6 +34,13 @@ paths-output = analog-output analog-output-lineout analog-output-speaker-always
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
 priority = 10
 
+[Mapping analog-surround-21]
+device-strings = surround21:%f
+channel-map = front-left,front-right,lfe
+paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker
+priority = 8
+direction = output
+
 [Mapping analog-surround-40]
 device-strings = surround40:%f
 channel-map = front-left,front-right,rear-left,rear-right

commit 65be25dd0faa566a74101d5a0f50d5a825b6f1e7
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri May 23 14:20:16 2014 +0200

    channelmap: Add 2.1 surround
    
    Add surround-21 as a alias to set up a 2.1 channel map.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c
index 72e4130..e1b173a 100644
--- a/src/pulse/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -536,6 +536,12 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) {
         map.map[0] = PA_CHANNEL_POSITION_LEFT;
         map.map[1] = PA_CHANNEL_POSITION_RIGHT;
         goto finish;
+    } else if (pa_streq(s, "surround-21")) {
+        map.channels = 3;
+        map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+        map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+        map.map[2] = PA_CHANNEL_POSITION_LFE;
+        goto finish;
     } else if (pa_streq(s, "surround-40")) {
         map.channels = 4;
         map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;