aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbmixer_maps.c
diff options
context:
space:
mode:
authorTimofei Bondarenko <tim@ipi.ac.ru>2007-10-30 10:28:14 -0400
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:14 -0500
commit69b1f1e8337fc94a7ea0730588960e82676dc2dc (patch)
treeb44d0756848e3dfc7713bbf57c20b4127bbd0a9e /sound/usb/usbmixer_maps.c
parent045765253c610cb5acebb22ae94d759f586d9521 (diff)
[ALSA] usb-audio - SB Live24-External better handling
This patch improves support for 'SB Live 24-bit Extarnal' USB card. 1) This card can go into muted state when a headphones connected or disconnected. So notify mixer about changes in headphone jack. 2) Add LED controls and procfs support just as in similar Audigy 2 NX card. 3) Rename 'PCM Capture' conrol to 'Mic Capture' to reflect reality: the card may adjust microphone input level only. Signed-off-by: Timofei Bondarenko <tim@ipi.ac.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/usb/usbmixer_maps.c')
-rw-r--r--sound/usb/usbmixer_maps.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c
index 7c4dcb3f436a..d755be0ad811 100644
--- a/sound/usb/usbmixer_maps.c
+++ b/sound/usb/usbmixer_maps.c
@@ -187,6 +187,13 @@ static struct usbmix_selector_map audigy2nx_selectors[] = {
187 { 0 } /* terminator */ 187 { 0 } /* terminator */
188}; 188};
189 189
190/* Creative SoundBlaster Live! 24-bit External */
191static struct usbmix_name_map live24ext_map[] = {
192 /* 2: PCM Playback Volume */
193 { 5, "Mic Capture" }, /* FU, default PCM Capture Volume */
194 { 0 } /* terminator */
195};
196
190/* LineX FM Transmitter entry - needed to bypass controls bug */ 197/* LineX FM Transmitter entry - needed to bypass controls bug */
191static struct usbmix_name_map linex_map[] = { 198static struct usbmix_name_map linex_map[] = {
192 /* 1: IT pcm */ 199 /* 1: IT pcm */
@@ -273,6 +280,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
273 .map = audigy2nx_map, 280 .map = audigy2nx_map,
274 .selector_map = audigy2nx_selectors, 281 .selector_map = audigy2nx_selectors,
275 }, 282 },
283 {
284 .id = USB_ID(0x041e, 0x3040),
285 .map = live24ext_map,
286 },
276 { 287 {
277 /* Hercules DJ Console (Windows Edition) */ 288 /* Hercules DJ Console (Windows Edition) */
278 .id = USB_ID(0x06f8, 0xb000), 289 .id = USB_ID(0x06f8, 0xb000),