[ALSA] OSS PCM emulation - The final fix for SNDCTL_DSP_GETOPTR problem
authorJaroslav Kysela <perex@suse.cz>
Tue, 31 May 2005 13:44:23 +0000 (15:44 +0200)
committerJaroslav Kysela <perex@suse.cz>
Wed, 22 Jun 2005 10:27:57 +0000 (12:27 +0200)
ALSA<-OSS emulation
The problem was negative result (info.bytes) in a specific condition at
playback startup.

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/core/oss/pcm_oss.c

index 468fca8894d9d0ab4fb442fb0fe835fb70ed7301..203470df5857b9eb6ab47cccf9f6e3ea27e6793f 100644 (file)
@@ -1539,10 +1539,13 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str
        } else {
                delay = snd_pcm_oss_bytes(substream, delay) + fixup;
                info.blocks = delay / runtime->oss.period_bytes;
-               if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+               if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                       if (runtime->oss.bytes == 0)
+                               delay = 0;
                        info.bytes = (runtime->oss.bytes - delay) & INT_MAX;
-               else
+               } else {
                        info.bytes = (runtime->oss.bytes + delay) & INT_MAX;
+               }
        }
        if (copy_to_user(_info, &info, sizeof(info)))
                return -EFAULT;