diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:40 +0200 |
| commit | eabaf0634a9034f2e487b0be347edc1460c026a4 (patch) | |
| tree | e950df1ba10e0a29b25afdd446ac44988381a851 /include | |
| parent | 9dea75c70965c240012251dc5845fe0c1a061180 (diff) | |
| parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
| download | linux-eabaf0634a9034f2e487b0be347edc1460c026a4.tar.gz linux-eabaf0634a9034f2e487b0be347edc1460c026a4.tar.bz2 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')
| -rw-r--r-- | include/sound/pcm.h | 1 |
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 */ |