diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-26 18:10:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-26 18:10:26 +0100 |
| commit | 67d692af480ed0656fb0fe7fdc6451374447dc7c (patch) | |
| tree | 09f66ff2d93c397466449c66fa903d2a28f42491 /include | |
| parent | 9b5beef1ddb3fa49e2c4b1d0770e70068ae93b1c (diff) | |
PCM: Add more chmap definitions for UAC2
The new PCM chmap positions have been added in (to be) 3.8-rc1 kernel,
and now updated alsa-lib, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/pcm.h | 13 | ||||
| -rw-r--r-- | include/sound/asound.h | 12 |
2 files changed, 22 insertions, 3 deletions
diff --git a/include/pcm.h b/include/pcm.h index 1ce91e7d..22356784 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -475,7 +475,7 @@ int snd_pcm_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2); int snd_pcm_unlink(snd_pcm_t *pcm); /** channel mapping API version number */ -#define SND_CHMAP_API_VERSION ((1 << 16) | (0 << 8) | 0) +#define SND_CHMAP_API_VERSION ((1 << 16) | (0 << 8) | 1) /** channel map list type */ enum snd_pcm_chmap_type { @@ -516,7 +516,16 @@ enum snd_pcm_chmap_position { 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 */ + SND_CHMAP_TFLC, /* top front left center */ + SND_CHMAP_TFRC, /* top front right center */ + SND_CHMAP_TSL, /* top side left */ + SND_CHMAP_TSR, /* top side right */ + SND_CHMAP_LLFE, /* left LFE */ + SND_CHMAP_RLFE, /* right LFE */ + SND_CHMAP_BC, /* bottom center */ + SND_CHMAP_BLC, /* bottom left center */ + SND_CHMAP_BRC, /* bottom right center */ + SND_CHMAP_LAST = SND_CHMAP_BRC, }; /** bitmask for channel position */ diff --git a/include/sound/asound.h b/include/sound/asound.h index 515b8fcd..1774a5c3 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -492,7 +492,17 @@ enum { SNDRV_CHMAP_TRL, /* top rear left */ SNDRV_CHMAP_TRR, /* top rear right */ SNDRV_CHMAP_TRC, /* top rear center */ - SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC, + /* new definitions for UAC2 */ + SNDRV_CHMAP_TFLC, /* top front left center */ + SNDRV_CHMAP_TFRC, /* top front right center */ + SNDRV_CHMAP_TSL, /* top side left */ + SNDRV_CHMAP_TSR, /* top side right */ + SNDRV_CHMAP_LLFE, /* left LFE */ + SNDRV_CHMAP_RLFE, /* right LFE */ + SNDRV_CHMAP_BC, /* bottom center */ + SNDRV_CHMAP_BLC, /* bottom left center */ + SNDRV_CHMAP_BRC, /* bottom right center */ + SNDRV_CHMAP_LAST = SNDRV_CHMAP_BRC, }; #define SNDRV_CHMAP_POSITION_MASK 0xffff |