summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:40 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:40 +0200
commiteabaf0634a9034f2e487b0be347edc1460c026a4 (patch)
treee950df1ba10e0a29b25afdd446ac44988381a851 /include/sound
parentMerge branch 'topic/oxygen' into for-linus (diff)
parentALSA: usbaudio - Add delay account (diff)
downloadlinux-eabaf0634a9034f2e487b0be347edc1460c026a4.tar.xz
linux-eabaf0634a9034f2e487b0be347edc1460c026a4.zip
Merge branch 'topic/pcm-delay' into for-linus
* topic/pcm-delay: ALSA: usbaudio - Add delay account ALSA: Add extra delay count in PCM
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/pcm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 0caf71e16944..2092274212b9 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -270,6 +270,7 @@ struct snd_pcm_runtime {
snd_pcm_uframes_t hw_ptr_base; /* Position at buffer restart */
snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */
unsigned long hw_ptr_jiffies; /* Time when hw_ptr is updated */
+ snd_pcm_sframes_t delay; /* extra delay; typically FIFO size */
/* -- HW params -- */
snd_pcm_access_t access; /* access mode */