Ver código fonte

[ALSA] OSS PCM emulation - The final fix for SNDCTL_DSP_GETOPTR problem

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>
Jaroslav Kysela 20 anos atrás
pai
commit
fb4bd0adc4
1 arquivos alterados com 5 adições e 2 exclusões
  1. 5 2
      sound/core/oss/pcm_oss.c

+ 5 - 2
sound/core/oss/pcm_oss.c

@@ -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;