[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, stable-queue, updated. v0.9.21-115-gdad4b4e

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The stable-queue branch has been updated
      from  b53f06a942d0cee1ebc056210f0383707e57048c (commit)

- Log -----------------------------------------------------------------
dad4b4e Handle 'Internal Mic 1' as an 'Input Source'
167a9a4 Add "Rear Mic" to alsa mixer paths.
-----------------------------------------------------------------------

Summary of changes:
 .../alsa/mixer/paths/analog-input-mic.conf.common  |    9 +++++++++
 .../alsa/mixer/paths/analog-input.conf.common      |    8 ++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------

commit 167a9a4ae660d253628d1931a773a5490786d1d7
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri Nov 19 10:41:46 2010 +0100

    Add "Rear Mic" to alsa mixer paths.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
index 4663305..9bddd48 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
@@ -62,6 +62,15 @@ name = input-boost-on
 [Option Front Mic Boost:off]
 name = input-boost-off
 
+[Element Rear Mic Boost]
+switch = select
+
+[Option Rear Mic Boost:on]
+name = input-boost-on
+
+[Option Rear Mic Boost:off]
+name = input-boost-off
+
 [Element Int Mic Boost]
 switch = select
 
diff --git a/src/modules/alsa/mixer/paths/analog-input.conf.common b/src/modules/alsa/mixer/paths/analog-input.conf.common
index 6c5fae9..5e73ae6 100644
--- a/src/modules/alsa/mixer/paths/analog-input.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input.conf.common
@@ -90,6 +90,10 @@ priority = 19
 name = input-microphone
 priority = 19
 
+[Option Input Source:Rear Mic]
+name = input-microphone
+priority = 19
+
 [Option Input Source:Line]
 name = input-linein
 priority = 18

commit dad4b4e7428a7612a3f55af35ed5fe8da8f16236
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Thu Nov 25 09:54:07 2010 -0500

    Handle 'Internal Mic 1' as an 'Input Source'
    
    BugLink: https://launchpad.net/bugs/680810
    
    Some laptops have 'Internal Mic 1' exposed as an 'Input Source', e.g., Dell
    XPSM 1530, so handle these, too.
    
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

diff --git a/src/modules/alsa/mixer/paths/analog-input.conf.common b/src/modules/alsa/mixer/paths/analog-input.conf.common
index 5e73ae6..0b2cfd9 100644
--- a/src/modules/alsa/mixer/paths/analog-input.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input.conf.common
@@ -94,6 +94,10 @@ priority = 19
 name = input-microphone
 priority = 19
 
+[Option Input Source:Internal Mic 1]
+name = input-microphone
+priority = 19
+
 [Option Input Source:Line]
 name = input-linein
 priority = 18

-- 
hooks/post-receive
PulseAudio Sound Server