diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2013-11-10 20:29:18 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-12 09:10:26 +0100 |
| commit | 5b0c6da0d8166cd404379740c5f75fda44ca5806 (patch) | |
| tree | 4669f005ea18dd3b523834937cf81351ac0626a4 | |
| parent | a1992044d5813371ce71f5252187942f943b198d (diff) | |
speaker-test: Always show chmap channel names if available
Currently speaker-test only uses channel names retrieved by
snd_pcm_chmap_long_name() when a channel map has been manually set.
However, the device may provide a default (or fixed) channel map that
differs from the traditional ALSA map, in which case wrong channel names
are shown.
Fix that by always using the name from the channel map when a channel
map is present.
Note that the names retrieved by snd_pcm_chmap_long_name() are not
currently localized via gettext.
Also note that Linux kernel HDMI driver reported wrong default channel
maps before 56cac413dd6d43af8355f5d1f90a199b540f73fc ("ALSA: hda - hdmi:
Fix reported channel map on common default layouts").
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | speaker-test/speaker-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c index 25b08dc..101bb0d 100644 --- a/speaker-test/speaker-test.c +++ b/speaker-test/speaker-test.c @@ -267,7 +267,7 @@ static int get_speaker_channel(int chn) static const char *get_channel_name(int chn) { #ifdef CONFIG_SUPPORT_CHMAP - if (channel_map_set && chn < channel_map->channels) { + if (channel_map && chn < channel_map->channels) { const char *name = snd_pcm_chmap_long_name(channel_map->pos[chn]); return name ? name : "Unknown"; } |