forked from pool/pulseaudio
Scott Reeves
8ebb7137f0
Copy from home:sreeves1:branches:multimedia:libs/pulseaudio via accept of submit request 30064 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/30064 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=37
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 540ec7b961256d6c7702448ca995f61268064190 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 13 Jan 2010 20:30:36 +0100
|
|
Subject: [PATCH] alsa: ignore volume changes from the hw if we are not on the active console
|
|
|
|
---
|
|
src/modules/alsa/alsa-sink.c | 3 +++
|
|
src/modules/alsa/alsa-source.c | 3 +++
|
|
2 files changed, 6 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
|
|
index ed16c83..690480f 100644
|
|
--- a/src/modules/alsa/alsa-sink.c
|
|
+++ b/src/modules/alsa/alsa-sink.c
|
|
@@ -1103,6 +1103,9 @@ static int mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
|
|
if (mask == SND_CTL_EVENT_MASK_REMOVE)
|
|
return 0;
|
|
|
|
+ if (u->sink->suspend_cause & PA_SUSPEND_SESSION)
|
|
+ return 0;
|
|
+
|
|
if (mask & SND_CTL_EVENT_MASK_VALUE) {
|
|
pa_sink_get_volume(u->sink, TRUE);
|
|
pa_sink_get_mute(u->sink, TRUE);
|
|
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
|
|
index 157698e..f8b583e 100644
|
|
--- a/src/modules/alsa/alsa-source.c
|
|
+++ b/src/modules/alsa/alsa-source.c
|
|
@@ -1051,6 +1051,9 @@ static int mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
|
|
if (mask == SND_CTL_EVENT_MASK_REMOVE)
|
|
return 0;
|
|
|
|
+ if (u->source->suspend_cause & PA_SUSPEND_SESSION)
|
|
+ return 0;
|
|
+
|
|
if (mask & SND_CTL_EVENT_MASK_VALUE) {
|
|
pa_source_get_volume(u->source, TRUE);
|
|
pa_source_get_mute(u->source, TRUE);
|
|
--
|
|
1.6.0.2
|
|
|