diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2020-12-26 22:15:20 +0200 |
|---|---|---|
| committer | Arun Raghavan <arun@asymptotic.io> | 2021-01-07 19:18:25 -0500 |
| commit | fdf91a035d88a22c6d6d41970a6c060838fcca3c (patch) | |
| tree | 3b2c4beeccb7d36adfba45dedf8cdf2606b57d5e | |
| parent | eb2c757d2d0c78f4760d9efcdff67a6e0db403e8 (diff) | |
| download | pulseaudio-fdf91a035d88a22c6d6d41970a6c060838fcca3c.tar.gz | |
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: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/272>
| -rw-r--r-- | src/modules/alsa/alsa-mixer.c | 1 | ||||
| -rw-r--r-- | src/modules/alsa/mixer/paths/analog-output-headphones-2.conf | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 7e316e281..e494a1282 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 |