On 2011-02-25 17:03, Colin Guthrie wrote:
'Twas brillig, and David Henningsson at 19/01/11 15:59 did gyre and gimble:
Yeah, I guess it's time. Let me know if you want six emails instead of one.

OK, I've applied this to my tree now. Just need to do a bit of testing
before I can happily push it out :)

Thanks :-)

One of the patches conflicted with this, so I guess your tree was a
little out of date, but I was able to adapt it easily enough (just added
the new rounding argument to the two additional calls that were added -
I presume this is sufficient but you may want to double check that there
are no other occurrences that need patching (I didn't find any).

This is because my patch set was against stable-queue, where this commit is not present. Btw, a few days ago I discovered the "Line Boost" element as well, so here comes a seventh patch for that.



commit 1bea9558297773fd2e2fe4deb43a5adabf90a16e
Author: Jyri Sarha<jyri.sa...@nokia.com>
Date:   Fri Oct 15 13:05:15 2010 +0300

     alsa: Take syncronized HW volume infra into use for alsa-sink

     Signed-off-by: Jyri Sarha<jyri.sa...@nokia.com>
     Reviewed-by: Tanu Kaskinen<tanu.kaski...@digia.com>
     Reviewd-by: Colin Guthrie<cguth...@mandriva.org>


With any luck I'll be able to test soon and get it pushed.

Col



--
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
>From bbf204c7f69869a5536e4f2731fd02c5e4c12999 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.hennings...@canonical.com>
Date: Wed, 16 Feb 2011 13:33:03 +0100
Subject: [PATCH 7/7] alsa-mixer: Add support for "Line Boost" element

Signed-off-by: David Henningsson <david.hennings...@canonical.com>
---
 .../alsa/mixer/paths/analog-input-linein.conf      |    7 +++++++
 .../alsa/mixer/paths/analog-input-mic.conf.common  |    4 ++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/modules/alsa/mixer/paths/analog-input-linein.conf b/src/modules/alsa/mixer/paths/analog-input-linein.conf
index 9362227..461cebd 100644
--- a/src/modules/alsa/mixer/paths/analog-input-linein.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-linein.conf
@@ -35,6 +35,13 @@ volume = off
 switch = off
 volume = off
 
+[Element Line Boost]
+required-any = any
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Line]
 required-any = any
 switch = mute
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 4bebc29..2e4f0d8 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
@@ -22,6 +22,10 @@
 switch = off
 volume = off
 
+[Element Line Boost]
+switch = off
+volume = off
+
 [Element Aux]
 switch = off
 volume = off
-- 
1.7.1

_______________________________________________
pulseaudio-discuss mailing list
pulseaudio-discuss@mail.0pointer.de
https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss

Reply via email to