diff options
| author | Nazar Mokrynskyi <nazar@mokrynskyi.com> | 2016-03-24 15:59:23 +0200 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2016-04-19 16:44:41 +0300 |
| commit | 7aac90236b04e649c0cd50560cc85397a8412f6b (patch) | |
| tree | 64d1d0270e7231f7b0826192f0166e928486ae58 | |
| parent | e89271b7508eda8c808c572f90919a8463ed2a1a (diff) | |
| download | pulseaudio-7aac90236b04e649c0cd50560cc85397a8412f6b.tar.gz | |
alsa-mixer: Support for Creative SoundBlaster Omni Surround 5.1 USB sound card with latest firmware
`Mic` is now detected as `Mic-In/Mic Array` (there are 2 microphones physically, nice to se this being understood).
`Line` is now detected as `Line In`.
Removed all output modes except officially supported stereo, 5.1 and stereo S/PDIF.
Also microphone/line in now might be used simultaneously with either output mode, yay!
3 files changed, 10 insertions, 15 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-input-linein.conf b/src/modules/alsa/mixer/paths/analog-input-linein.conf index 2c94a0b09..8163ffb2c 100644 --- a/src/modules/alsa/mixer/paths/analog-input-linein.conf +++ b/src/modules/alsa/mixer/paths/analog-input-linein.conf @@ -69,6 +69,10 @@ enumeration = select name = analog-input-linein required-any = any +[Option PCM Capture Source:Line In] +name = analog-input-linein +required-any = any + [Element Mic] switch = off volume = off diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf b/src/modules/alsa/mixer/paths/analog-input-mic.conf index 4d64f92dd..123439b6c 100644 --- a/src/modules/alsa/mixer/paths/analog-input-mic.conf +++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf @@ -76,6 +76,10 @@ enumeration = select name = analog-input-microphone required-any = any +[Option PCM Capture Source:Mic-In/Mic Array] +name = analog-input-microphone +required-any = any + ;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)" [Element Mic Select] diff --git a/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf b/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf index e534def55..d5922da7e 100644 --- a/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf +++ b/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf @@ -20,7 +20,8 @@ ; This config supports both cases. ; Also by default there are some non-existing (physically) inputs ; and outputs that are not present here. -; And finally in 2.1 mode LFE is not working, so it is removed also. +; And finally officially supported modes are stereo and 5.1 + stereo S/PDIF, +; so only these modes included. ; ; See default.conf for an explanation on the directives used here. @@ -42,20 +43,6 @@ paths-input = analog-input-mic analog-input-linein channel-map = left,right direction = input -[Mapping analog-surround-41] -device-strings = surround41:%f -channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output -priority = 7 -direction = output - -[Mapping analog-surround-50] -device-strings = surround50:%f -channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output -priority = 8 -direction = output - [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe |