Re: rtcw,quake3 hang on exit

[Takashi Iwai <tiwai@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 664 bytes --]

Hi Michael,

At 08 Apr 2002 22:01:49 +0200,
Michael Jochum wrote:
> 
> On Mon, 2002-04-08 at 17:05, Takashi Iwai wrote:
> > i got the point.
> > snd_pcm_playback_drain() (which is called at closing the pcm) never
> > returns when OSS is running on mmap mode. 
> > now fixed on cvs.  please give a try.
> 
> i tried cvs - quake3 and rtcw don`t hang on exit now - BUT there is no
> sound at all during the game. there is sound during the intro and when
> moving the mouse over the buttons in the main menu but no sound during
> the game. maybe the intro does not use the mmap mode?
 
could you try the following patch?
if it's ok, i'll commit this to cvs.


Takashi

[-- Attachment #2: oss-mmap-fix.dif --]
[-- Type: application/octet-stream, Size: 1235 bytes --]

Index: alsa-kernel/core/pcm_lib.c
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-kernel/core/pcm_lib.c,v
retrieving revision 1.7
diff -u -r1.7 pcm_lib.c
--- alsa-kernel/core/pcm_lib.c	8 Apr 2002 11:42:08 -0000	1.7
+++ alsa-kernel/core/pcm_lib.c	9 Apr 2002 08:34:10 -0000
@@ -142,13 +142,17 @@
 		avail = snd_pcm_capture_avail(runtime);
 	if (avail > runtime->avail_max)
 		runtime->avail_max = avail;
-	/* here we need to check both stop_threshold and buffer_size, because
-	   OSS mmap mode sets stop_threshold as maximum (boundary size). */
-	if (avail >= runtime->stop_threshold ||
-	    avail >= runtime->buffer_size) {
+	if (avail >= runtime->stop_threshold) {
 		snd_pcm_stop(substream,
 			     runtime->status->state == SNDRV_PCM_STATE_DRAINING ?
 			     SNDRV_PCM_STATE_SETUP : SNDRV_PCM_STATE_XRUN);
+		return -EPIPE;
+	}
+	/* here need to check the avail size in draining because
+	   OSS mmap mode sets stop_threshold as maximum (boundary size). */
+	if (runtime->status->state == SNDRV_PCM_STATE_DRAINING &&
+	    avail >= runtime->buffer_size) {
+		snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
 		return -EPIPE;
 	}
 	if (avail >= runtime->control->avail_min)