From 80efd7a64c4684999197d5bf77c3c6b667491476 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Thu, 13 May 2021 09:16:58 +0800 Subject: [PATCH] Revert "alsa-mixer: Set "Front" control to 0 dB on headphone path" This reverts commit 96369919e5100865e2469e42fb8f4b8e38e41aef. The commit was originally for the issue of Headphone can't output sound, that was because the Headphone and Lineout share the 1st alsa mixer and DAC, but this commit introduced a new issue of the speaker is not muted after switching to headphone. A recent merged kernel commit (f48652bbe3ae@linux) could fix the 1st issue, so we could revert the fix of the 1st issue from PA, then the 2nd issue is fixed automatically. BugLink: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/747 Signed-off-by: Hui Wang Part-of: --- src/modules/alsa/mixer/paths/analog-output-headphones-2.conf | 5 ++--- src/modules/alsa/mixer/paths/analog-output-headphones.conf | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf index 178999088..e98fe2537 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf @@ -84,10 +84,9 @@ volume = off switch = off volume = off -; On some machines Front is actually a part of the Headphone path [Element Front] -switch = mute -volume = zero +switch = off +volume = off [Element Rear] switch = off diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf index c808e19e1..ac4ec659a 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf @@ -126,10 +126,9 @@ volume = off switch = off volume = off -; On some machines Front is actually a part of the Headphone path [Element Front] -switch = mute -volume = zero +switch = off +volume = off [Element Rear] switch = off