Accepting request 158620 from home:tiwai:branches:multimedia:libs

- Fix a bug setting speaker volume to zero wrongly (bnc#805865)

OBS-URL: https://build.opensuse.org/request/show/158620
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=115
This commit is contained in:
Takashi Iwai 2013-03-12 07:13:12 +00:00 committed by Git OBS Bridge
parent 22ea73f318
commit 9cc170d035
3 changed files with 44 additions and 0 deletions

View File

@ -0,0 +1,37 @@
From a703451811f31abe6302f39675c1e1fdfc1925d6 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Wed, 19 Dec 2012 10:24:33 +0000
Subject: alsa-mixer: Fix the analog-output-speaker-always path
A left over "required-any" made this path useless for most people.
While we're at it, also add "Front Headphone" like for the normal
speaker path.
Tested-by: Colin Guthrie <gmane@colin.guthr.ie>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
index 3ebdc4a..8a2b3df 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -30,6 +30,10 @@ device.icon_name = audio-speakers
state.plugged = no
state.unplugged = unknown
+[Jack Front Headphone]
+state.plugged = no
+state.unplugged = unknown
+
[Element Hardware Master]
switch = mute
volume = merge
@@ -132,7 +136,6 @@ switch = mute
volume = merge
override-map.1 = lfe
override-map.2 = lfe,lfe
-required-any = any
[Element CLFE]
switch = mute
--
cgit v0.9.0.2-2-gbebe

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 8 10:17:34 CET 2013 - tiwai@suse.de
- Fix a bug setting speaker volume to zero wrongly (bnc#805865)
-------------------------------------------------------------------
Tue Mar 5 06:03:19 UTC 2013 - crrodriguez@opensuse.org

View File

@ -34,6 +34,7 @@ Source99: baselibs.conf
Patch0: disabled-start.diff
Patch1: suppress-socket-error-msg.diff
Patch2: pulseaudio-wrong-memset.patch
Patch3: pulseaudio-alsa-speaker-zero-vol-fix.patch
%if 0%{?suse_version} >= 1210
BuildRequires: pkgconfig(systemd)
%endif
@ -264,6 +265,7 @@ translation-update-upstream
%patch0
%patch1 -p1
%patch2
%patch3 -p1
%build
autoreconf -fiv