diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2008-01-08 12:24:01 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:46 +0100 |
| commit | a713b5834731f32757b30de038dcb995afac2ad1 (patch) | |
| tree | b42219e374bd9a8444a8ba0b33d9dca6fc9de9a2 /sound/core | |
| parent | 0678accd2da33873455ef8d41d847bd550727159 (diff) | |
| download | linux-a713b5834731f32757b30de038dcb995afac2ad1.tar.gz linux-a713b5834731f32757b30de038dcb995afac2ad1.tar.bz2 linux-a713b5834731f32757b30de038dcb995afac2ad1.zip | |
[ALSA] PCM core - remove SNDRV_PCM_TSTAMP_MMAP condition in snd_pcm_status()
The condition caused that the returned ring buffer position does not match
with timestamp when SNDRV_PCM_TSTAMP_MMAP mode was enabled. Removing
condition makes unified behaviour and interrupt based timestamp can be
accessed via PCM_IOCTL_SYNC_PTR or mmaped status area.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_native.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 2e7b1e63db94..3fc33deabe35 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -593,14 +593,9 @@ int snd_pcm_status(struct snd_pcm_substream *substream, if (status->state == SNDRV_PCM_STATE_OPEN) goto _end; status->trigger_tstamp = runtime->trigger_tstamp; - if (snd_pcm_running(substream)) { + if (snd_pcm_running(substream)) snd_pcm_update_hw_ptr(substream); - if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_MMAP) - status->tstamp = runtime->status->tstamp; - else - snd_pcm_gettime(runtime, &status->tstamp); - } else - snd_pcm_gettime(runtime, &status->tstamp); + snd_pcm_gettime(runtime, &status->tstamp); status->appl_ptr = runtime->control->appl_ptr; status->hw_ptr = runtime->status->hw_ptr; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { |