From 334325efd7d8ba32ca3c4ba8f90dccae7abe914c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Jun 2009 04:17:25 +0200
Subject: alsa: allow placing device id in alsa device strings at arbitrary
 positions

---
 src/modules/alsa/mixer/profile-sets/default.conf | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/modules/alsa/mixer/profile-sets')

diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index bced10ad..bbe53410 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -22,49 +22,49 @@
 auto-profiles = yes
 
 [Mapping analog-mono]
-device-strings = hw
+device-strings = hw:%f
 channel-map = mono
 paths-output = analog-output analog-output-headphones analog-output-mono analog-output-lfe-on-mono
 paths-input = 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 = 1
 
 [Mapping analog-stereo]
-device-strings = front hw
+device-strings = front:%f hw:%f
 channel-map = left,right
 paths-output = analog-output analog-output-headphones analog-output-mono analog-output-lfe-on-mono
 paths-input = 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-40]
-device-strings = surround40
+device-strings = surround40:%f
 channel-map = front-left,front-right,rear-left,rear-right
 paths-output = analog-output analog-output-lfe-on-mono
 priority = 7
 direction = output
 
 [Mapping analog-surround-41]
-device-strings = surround41
+device-strings = surround41:%f
 channel-map = front-left,front-right,rear-left,rear-right,lfe
 paths-output = analog-output analog-output-lfe-on-mono
 priority = 8
 direction = output
 
 [Mapping analog-surround-50]
-device-strings = surround50
+device-strings = surround50:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center
 paths-output = analog-output analog-output-lfe-on-mono
 priority = 7
 direction = output
 
 [Mapping analog-surround-51]
-device-strings = surround51
+device-strings = surround51:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
 paths-output = analog-output analog-output-lfe-on-mono
 priority = 8
 direction = output
 
 [Mapping analog-surround-71]
-device-strings = surround71
+device-strings = surround71:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
 description = Analog Surround 7.1
 paths-output = analog-output analog-output-lfe-on-mono
@@ -72,29 +72,29 @@ priority = 7
 direction = output
 
 [Mapping iec958-stereo]
-device-strings = iec958
+device-strings = iec958:%f
 channel-map = left,right
 priority = 5
 
 [Mapping iec958-surround-40]
-device-strings = iec958
+device-strings = iec958:%f
 channel-map = front-left,front-right,rear-left,rear-right
 priority = 1
 
 [Mapping iec958-ac3-surround-40]
-device-strings = a52
+device-strings = a52:%f
 channel-map = front-left,front-right,rear-left,rear-right
 priority = 2
 direction = output
 
 [Mapping iec958-ac3-surround-51]
-device-strings = a52
+device-strings = a52:%f
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
 priority = 3
 direction = output
 
 [Mapping hdmi-stereo]
-device-strings = hdmi
+device-strings = hdmi:%f
 channel-map = left,right
 priority = 4
 direction = output
-- 
cgit