diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-12 18:43:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-13 08:24:59 +0200 |
| commit | f7300682dc0fe9faec94461af6fdcf098047a0d1 (patch) | |
| tree | c399323d939cabce01a9cc99dad17662fb21467f /include | |
| parent | 58c45b30309a1dd255c8b9e5cb34398658867b81 (diff) | |
PCM: Define MONO and other channel map positions
Follow the new definitions in the kernel side. MONO and others have
been added, and the order of position table was changed again.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/pcm.h | 11 | ||||
| -rw-r--r-- | include/sound/asound.h | 13 |
2 files changed, 19 insertions, 5 deletions
diff --git a/include/pcm.h b/include/pcm.h index 8129ed34..5fb6130f 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -489,6 +489,8 @@ enum snd_pcm_chmap_type { /** channel positions */ enum snd_pcm_chmap_position { SND_CHMAP_UNKNOWN = 0, /** unspecified */ + SND_CHMAP_NA, /** N/A, silent */ + SND_CHMAP_MONO, /** mono stream */ SND_CHMAP_FL, /** front left */ SND_CHMAP_FR, /** front right */ SND_CHMAP_RL, /** rear left */ @@ -508,8 +510,13 @@ enum snd_pcm_chmap_position { SND_CHMAP_FCH, /** front center high */ SND_CHMAP_FRH, /** front right high */ SND_CHMAP_TC, /** top center */ - SND_CHMAP_NA, /** N/A, silent */ - SND_CHMAP_LAST = SND_CHMAP_NA, /** last entry */ + SND_CHMAP_TFL, /** top front left */ + SND_CHMAP_TFR, /** top front right */ + SND_CHMAP_TFC, /** top front center */ + SND_CHMAP_TRL, /** top rear left */ + SND_CHMAP_TRR, /** top rear right */ + SND_CHMAP_TRC, /** top rear center */ + SND_CHMAP_LAST = SND_CHMAP_TRC, /** last entry */ }; #define SND_CHMAP_POSITION_MASK 0xffff /** bitmask for channel position */ diff --git a/include/sound/asound.h b/include/sound/asound.h index cb1b9c58..e24d144a 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -479,8 +479,10 @@ enum { /* channel positions */ enum { - /* this follows the alsa-lib mixer channel value + 1 */ SNDRV_CHMAP_UNKNOWN = 0, + SNDRV_CHMAP_NA, /* N/A, silent */ + SNDRV_CHMAP_MONO, /* mono stream */ + /* this follows the alsa-lib mixer channel value + 3 */ SNDRV_CHMAP_FL, /* front left */ SNDRV_CHMAP_FR, /* front right */ SNDRV_CHMAP_RL, /* rear left */ @@ -501,8 +503,13 @@ enum { SNDRV_CHMAP_FCH, /* front center high */ SNDRV_CHMAP_FRH, /* front right high */ SNDRV_CHMAP_TC, /* top center */ - SNDRV_CHMAP_NA, /* N/A, silent */ - SNDRV_CHMAP_LAST = SNDRV_CHMAP_NA, + SNDRV_CHMAP_TFL, /* top front left */ + SNDRV_CHMAP_TFR, /* top front right */ + SNDRV_CHMAP_TFC, /* top front center */ + SNDRV_CHMAP_TRL, /* top rear left */ + SNDRV_CHMAP_TRR, /* top rear right */ + SNDRV_CHMAP_TRC, /* top rear center */ + SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC, }; #define SNDRV_CHMAP_POSITION_MASK 0xffff |