summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-09-12 18:06:54 +0200
committerTakashi Iwai <tiwai@suse.de>2012-09-12 18:13:03 +0200
commit7b31d0095e87221dc32c95642a2a714ea08259aa (patch)
tree098dc2c137b0f9a0d098d6e7751ab350e027cd6e /sound/pci
parent0afdb8f2869610b7c2eb99d75ba8b9003b8e88d7 (diff)
downloadlinux-7b31d0095e87221dc32c95642a2a714ea08259aa.tar.gz
linux-7b31d0095e87221dc32c95642a2a714ea08259aa.tar.bz2
linux-7b31d0095e87221dc32c95642a2a714ea08259aa.zip
ALSA: Define more channel map positions
For following the standard, define more channel map positions and shuffle the items a bit: - As both PulseAudio and gstreamer define MONO channel position explicitly, we should follow that, too. The mono streams point to this channel position unless they are explicitly assigned to certain channel positions. - Top-front-* and Top-rear-* positions are added, carried from PulseAudio's definitions. - Move NA and MONO definitions at the top of table right after UNKNOWN, since these are more abstract in comparison with other practical positions. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/ctxfi/ctpcm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index d317107d98cc..e8a4feb1ed86 100644
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -397,7 +397,7 @@ static struct snd_pcm_ops ct_pcm_capture_ops = {
static const struct snd_pcm_chmap_elem surround_map[] = {
{ .channels = 1,
- .map = { SNDRV_CHMAP_UNKNOWN } },
+ .map = { SNDRV_CHMAP_MONO } },
{ .channels = 2,
.map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },
{ }
@@ -405,7 +405,7 @@ static const struct snd_pcm_chmap_elem surround_map[] = {
static const struct snd_pcm_chmap_elem clfe_map[] = {
{ .channels = 1,
- .map = { SNDRV_CHMAP_UNKNOWN } },
+ .map = { SNDRV_CHMAP_MONO } },
{ .channels = 2,
.map = { SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE } },
{ }
@@ -413,7 +413,7 @@ static const struct snd_pcm_chmap_elem clfe_map[] = {
static const struct snd_pcm_chmap_elem side_map[] = {
{ .channels = 1,
- .map = { SNDRV_CHMAP_UNKNOWN } },
+ .map = { SNDRV_CHMAP_MONO } },
{ .channels = 2,
.map = { SNDRV_CHMAP_SL, SNDRV_CHMAP_SR } },
{ }