summaryrefslogtreecommitdiff
path: root/src/modules/alsa/alsa-mixer.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-09-08 15:10:41 +0300
committerTanu Kaskinen <tanuk@iki.fi>2017-09-18 18:49:34 +0300
commit56b6e3253500051828c1fc43f16054aa4211ad5f (patch)
tree1de4dfa483e31005509517f19dca341532e23f73 /src/modules/alsa/alsa-mixer.c
parentbd151646ddeb03c02d7e677a91eb09614acde8e1 (diff)
alsa-mixer: add mixer handling to the fallback stereo case
Some sound cards don't have any alsa-lib configuration, but they used to work well enough up to PulseAudio 10. PulseAudio 11 stopped using "hw:0" for the analog-stereo mapping, and instead defined it as a fallback mapping without any mixer handling. As a result, switching between headphones and speakers stopped working without changing the mixer settings manually at least on Toshiba Chromebook 2. This patch adds the mixer handling back to the fallback mapping. I also renamed "unknown-stereo" to "stereo-fallback", because I like that name more. BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=102560
Diffstat (limited to 'src/modules/alsa/alsa-mixer.c')
-rw-r--r--src/modules/alsa/alsa-mixer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 08ea45d33..7de1c7deb 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -3990,6 +3990,7 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) {
static const struct description_map well_known_descriptions[] = {
{ "analog-mono", N_("Analog Mono") },
{ "analog-stereo", N_("Analog Stereo") },
+ { "stereo-fallback", N_("Stereo") },
/* Note: Not translated to "Analog Stereo Input", because the source
* name gets "Input" appended to it automatically, so adding "Input"
* here would lead to the source name to become "Analog Stereo Input
@@ -4017,7 +4018,6 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) {
{ "iec958-dts-surround-51", N_("Digital Surround 5.1 (IEC958/DTS)") },
{ "hdmi-stereo", N_("Digital Stereo (HDMI)") },
{ "hdmi-surround-51", N_("Digital Surround 5.1 (HDMI)") },
- { "unknown-stereo", N_("Stereo") },
};
pa_assert(m);