I'd like to see this merged before 9.0.

Sincerely, Nazar Mokrynskyi
github.com/nazar-pc
Skype: nazar-pc
Diaspora: [email protected]
Tox: 
A9D95C9AA5F7A3ED75D83D0292E22ACE84BA40E912185939414475AF28FD2B2A5C8EF5261249

On 24.03.16 15:59, Nazar Mokrynskyi wrote:
`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!
---
  src/modules/alsa/mixer/paths/analog-input-linein.conf   |  4 ++++
  src/modules/alsa/mixer/paths/analog-input-mic.conf      |  4 ++++
  .../alsa/mixer/profile-sets/sb-omni-surround-5.1.conf   | 17 ++---------------
  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 2c94a0b..8163ffb 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 4d64f92..123439b 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 e534def..d5922da 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

Attachment: smime.p7s
Description: Кріптографічний підпис S/MIME

_______________________________________________
pulseaudio-discuss mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss

Reply via email to