diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-21 08:47:18 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-09-06 12:08:34 -0400 |
commit | 080108c4747c7378c3601b8584237484f977d8a8 (patch) | |
tree | 1fd819403a1e6ea93dae80bdaafd1ed3b2407ff7 /Documentation/sound | |
parent | 6e67683d718c627aa585a82ae0eb44a7058eae5a (diff) |
ALSA: Follow channel position definitions to alsa-lib mixer
There is already a set of channel position definitions in alsa-lib
mixer.h, and it'd be more practical to keep the same order for the
PCM channel map, too. The value is shifted with 1 to keep zero for
UNKNOWN.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/alsa/Channel-Mapping-API.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Documentation/sound/alsa/Channel-Mapping-API.txt b/Documentation/sound/alsa/Channel-Mapping-API.txt index df930aa4f4d0..4bbf12d5553f 100644 --- a/Documentation/sound/alsa/Channel-Mapping-API.txt +++ b/Documentation/sound/alsa/Channel-Mapping-API.txt | |||
@@ -76,20 +76,22 @@ here is a cut: | |||
76 | 76 | ||
77 | /* channel positions */ | 77 | /* channel positions */ |
78 | enum { | 78 | enum { |
79 | /* this follows the alsa-lib mixer channel value + 1 */ | ||
79 | SNDRV_CHMAP_UNKNOWN = 0, | 80 | SNDRV_CHMAP_UNKNOWN = 0, |
80 | SNDRV_CHMAP_FL, /* front left */ | 81 | SNDRV_CHMAP_FL, /* front left */ |
81 | SNDRV_CHMAP_FC, /* front center */ | ||
82 | SNDRV_CHMAP_FR, /* front right */ | 82 | SNDRV_CHMAP_FR, /* front right */ |
83 | SNDRV_CHMAP_FLC, /* front left center */ | ||
84 | SNDRV_CHMAP_FRC, /* front right center */ | ||
85 | SNDRV_CHMAP_RL, /* rear left */ | 83 | SNDRV_CHMAP_RL, /* rear left */ |
86 | SNDRV_CHMAP_RC, /* rear center */ | ||
87 | SNDRV_CHMAP_RR, /* rear right */ | 84 | SNDRV_CHMAP_RR, /* rear right */ |
88 | SNDRV_CHMAP_RLC, /* rear left center */ | 85 | SNDRV_CHMAP_FC, /* front center */ |
89 | SNDRV_CHMAP_RRC, /* rear right center */ | 86 | SNDRV_CHMAP_LFE, /* LFE */ |
90 | SNDRV_CHMAP_SL, /* side left */ | 87 | SNDRV_CHMAP_SL, /* side left */ |
91 | SNDRV_CHMAP_SR, /* side right */ | 88 | SNDRV_CHMAP_SR, /* side right */ |
92 | SNDRV_CHMAP_LFE, /* LFE */ | 89 | SNDRV_CHMAP_RC, /* rear center */ |
90 | /* new definitions */ | ||
91 | SNDRV_CHMAP_FLC, /* front left center */ | ||
92 | SNDRV_CHMAP_FRC, /* front right center */ | ||
93 | SNDRV_CHMAP_RLC, /* rear left center */ | ||
94 | SNDRV_CHMAP_RRC, /* rear right center */ | ||
93 | SNDRV_CHMAP_FLW, /* front left wide */ | 95 | SNDRV_CHMAP_FLW, /* front left wide */ |
94 | SNDRV_CHMAP_FRW, /* front right wide */ | 96 | SNDRV_CHMAP_FRW, /* front right wide */ |
95 | SNDRV_CHMAP_FLH, /* front left high */ | 97 | SNDRV_CHMAP_FLH, /* front left high */ |