summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2015-08-06 12:19:12 +0200
committerTanu Kaskinen <tanuk@iki.fi>2015-08-21 11:25:26 +0300
commit74b0fb45e534fab226ed1597cada18e828e0cdeb (patch)
tree72a6cb3caecd5027d7efcd7e3d3697460c998c18
parent9d6700f66a462fb1b1abeb188676db74e4dfcd97 (diff)
downloadpulseaudio-74b0fb45e534fab226ed1597cada18e828e0cdeb.tar.gz
alsa-mixer: Add descriptions for analog-stereo-input and analog-stereo-output mappings
These mapping names are used in sb-omni-surround-5.1.conf, which needs to use separate mappings for input and output, since they are associated with different alsa devices.
-rw-r--r--src/modules/alsa/alsa-mixer.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 2314612d4..bbe1d0f5a 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -3899,8 +3899,13 @@ 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") },
- /* Note: Not translated to "Multichannel Input" - then the source name would be "Multichannel Input Input".
- Same for multichannel-output. */
+ /* 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
+ * Input". The same logic applies to analog-stereo-output,
+ * multichannel-input and multichannel-output. */
+ { "analog-stereo-input", N_("Analog Stereo") },
+ { "analog-stereo-output", N_("Analog Stereo") },
{ "multichannel-input", N_("Multichannel") },
{ "multichannel-output", N_("Multichannel") },
{ "analog-surround-21", N_("Analog Surround 2.1") },