diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-31 13:53:22 -0700 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-13 08:24:58 +0200 |
| commit | 48c2c90f19f07d02082d9fb84fb36ac1fcfa84e1 (patch) | |
| tree | 7181e9ba11bca419555fdfb45d969965ca275d98 /include | |
| parent | 0f36270dd315b9baf3a93f5586776b91c0bcf589 (diff) | |
Add SND_CHMAP_NA and bit flag definitions
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/pcm.h | 7 | ||||
| -rw-r--r-- | include/sound/asound.h | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/include/pcm.h b/include/pcm.h index 22194fcd..ee89a7ea 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -504,9 +504,14 @@ enum snd_pcm_chmap_position { SND_CHMAP_FCH, /** front center high */ SND_CHMAP_FRH, /** front right high */ SND_CHMAP_TC, /** top center */ - SND_CHMAP_LAST = SND_CHMAP_TC, /** last entry */ + SND_CHMAP_NA, /** N/A, silent */ + SND_CHMAP_LAST = SND_CHMAP_NA, /** last entry */ }; +#define SND_CHMAP_POSITION_MASK 0xffff /** bitmask for channel position */ +#define SND_CHMAP_PHASE_INVERSE (0x01 << 16) /* the channel is phase inverted */ +#define SND_CHMAP_DRIVER_SPEC (0x02 << 16) /* non-standard channel value */ + int **snd_pcm_query_chmaps(snd_pcm_t *pcm); void snd_pcm_free_chmaps(int **maps); int *snd_pcm_get_chmap(snd_pcm_t *pcm); diff --git a/include/sound/asound.h b/include/sound/asound.h index bb6db9d2..cb1b9c58 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -479,7 +479,7 @@ enum { /* channel positions */ enum { - /* this follows the alsa-lib mixer channel value + 1*/ + /* this follows the alsa-lib mixer channel value + 1 */ SNDRV_CHMAP_UNKNOWN = 0, SNDRV_CHMAP_FL, /* front left */ SNDRV_CHMAP_FR, /* front right */ @@ -501,9 +501,14 @@ enum { SNDRV_CHMAP_FCH, /* front center high */ SNDRV_CHMAP_FRH, /* front right high */ SNDRV_CHMAP_TC, /* top center */ - SNDRV_CHMAP_LAST = SNDRV_CHMAP_TC, + SNDRV_CHMAP_NA, /* N/A, silent */ + SNDRV_CHMAP_LAST = SNDRV_CHMAP_NA, }; +#define SNDRV_CHMAP_POSITION_MASK 0xffff +#define SNDRV_CHMAP_PHASE_INVERSE (0x01 << 16) +#define SNDRV_CHMAP_DRIVER_SPEC (0x02 << 16) + enum { SNDRV_PCM_IOCTL_PVERSION = _IOR('A', 0x00, int), SNDRV_PCM_IOCTL_INFO = _IOR('A', 0x01, struct sndrv_pcm_info), |