diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-07-10 03:50:19 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-07-10 10:58:15 -0400 |
commit | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (patch) | |
tree | 833064daee079d8c84874a4ec7cf1e7d025ac460 /include/uapi/sound/asound.h | |
parent | 0ac8a52d4541adc284a4f3e8a1f6847236de1d8a (diff) |
ALSA: pcm: Add timestamp type to sw_params
For allowing adjusting the timestamp type on the fly, add it to
sw_params. The existing ioctl is still kept for compatibility.
Along with this, increment the PCM protocol version.
The extension was suggested by Clemens Ladisch.
Acked-by: Jaroslav Kysela <perex@perex.cz>
Reviewed-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi/sound/asound.h')
-rw-r--r-- | include/uapi/sound/asound.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index cbf7dc850a46..a7e062f91f39 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h | |||
@@ -139,7 +139,7 @@ struct snd_hwdep_dsp_image { | |||
139 | * * | 139 | * * |
140 | *****************************************************************************/ | 140 | *****************************************************************************/ |
141 | 141 | ||
142 | #define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 11) | 142 | #define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 12) |
143 | 143 | ||
144 | typedef unsigned long snd_pcm_uframes_t; | 144 | typedef unsigned long snd_pcm_uframes_t; |
145 | typedef signed long snd_pcm_sframes_t; | 145 | typedef signed long snd_pcm_sframes_t; |
@@ -391,7 +391,9 @@ struct snd_pcm_sw_params { | |||
391 | snd_pcm_uframes_t silence_threshold; /* min distance from noise for silence filling */ | 391 | snd_pcm_uframes_t silence_threshold; /* min distance from noise for silence filling */ |
392 | snd_pcm_uframes_t silence_size; /* silence block size */ | 392 | snd_pcm_uframes_t silence_size; /* silence block size */ |
393 | snd_pcm_uframes_t boundary; /* pointers wrap point */ | 393 | snd_pcm_uframes_t boundary; /* pointers wrap point */ |
394 | unsigned char reserved[64]; /* reserved for future */ | 394 | unsigned int tstamp_type; /* timestamp type */ |
395 | int pads; /* alignment, reserved */ | ||
396 | unsigned char reserved[56]; /* reserved for future */ | ||
395 | }; | 397 | }; |
396 | 398 | ||
397 | struct snd_pcm_channel_info { | 399 | struct snd_pcm_channel_info { |