From d51870d4f0f559102cb3860f32522bf163729419 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Sat, 26 Dec 2020 22:15:20 +0200 Subject: [PATCH] alsa-mixer: Use unambiguous descriptions with dual headphone outputs Previously both paths had description "Headphones", which I assume can cause confusion with users who see two ports with identical names. I don't have this kind of hardware myself nor have I heard complaints from users, this is just something I noticed while reading the configuration files. Part-of: --- src/modules/alsa/alsa-mixer.c | 1 + src/modules/alsa/mixer/paths/analog-output-headphones-2.conf | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 58c33bf48..a6e6672ad 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -2797,6 +2797,7 @@ static int path_verify(pa_alsa_path *p) { { "analog-input-video", N_("Video"), PA_DEVICE_PORT_TYPE_VIDEO }, { "analog-output", N_("Analog Output"), PA_DEVICE_PORT_TYPE_ANALOG }, { "analog-output-headphones", N_("Headphones"), PA_DEVICE_PORT_TYPE_HEADPHONES }, + { "analog-output-headphones-2", N_("Headphones 2"), PA_DEVICE_PORT_TYPE_HEADPHONES }, { "analog-output-headphones-mono", N_("Headphones Mono Output"), PA_DEVICE_PORT_TYPE_HEADPHONES }, { "analog-output-lineout", N_("Line Out"), PA_DEVICE_PORT_TYPE_LINE }, { "analog-output-mono", N_("Analog Mono Output"), PA_DEVICE_PORT_TYPE_ANALOG }, 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 30815d0a8..33f1cfd2e 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf @@ -19,7 +19,6 @@ [General] priority = 98 -description-key = analog-output-headphones [Properties] device.icon_name = audio-headphones