[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-235-g25e5197

[Lennart Poettering]

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 master branch has been updated
      from  8fe50b0d7cd4a93be85887bdb7efd2663face50d (commit)

- Log -----------------------------------------------------------------
25e5197 alsa: merge mic boost into volume slider
-----------------------------------------------------------------------

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

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

commit 25e5197f6adb6a371631237a53de15eb4dc1a776
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 18 15:50:41 2009 +0200

    alsa: merge mic boost into volume slider

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 d67ee4e..db70e50 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
@@ -15,6 +15,7 @@ priority = 19
 
 [Element Mic Boost (+20dB)]
 switch = select
+volume = merge
 
 [Option Mic Boost (+20dB):on]
 name = input-boost-on
@@ -24,6 +25,7 @@ name = input-boost-off
 
 [Element Mic Boost]
 switch = select
+volume = merge
 
 [Option Mic Boost:on]
 name = input-boost-on

-- 
hooks/post-receive
PulseAudio Sound Server