Re: [linux-audio-user] Re: alsaplayer not working with alsa?

[Takashi Iwai <tiwai@suse.de>]

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

Hi Mark and Jack,

regarding to the alsaplayer problem:

could you try the attached patch (to cvs version) ?
hope this fixes the nasty bug...


ciao,

Takashi

[-- Attachment #2: pcm-unlink-fix.dif --]
[-- Type: application/octet-stream, Size: 1299 bytes --]

Index: alsa-lib/src/pcm/pcm.c
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.122
diff -u -r1.122 pcm.c
--- alsa-lib/src/pcm/pcm.c	19 Dec 2002 11:33:08 -0000	1.122
+++ alsa-lib/src/pcm/pcm.c	23 Jan 2003 18:29:28 -0000
@@ -6291,7 +6291,7 @@
 			goto __found;
 		}
 	}
-	assert(0);
+	/* assert(0); */
 	return;
 
       __found:
Index: alsa-lib/src/pcm/pcm_plug.c
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-lib/src/pcm/pcm_plug.c,v
retrieving revision 1.72
diff -u -r1.72 pcm_plug.c
--- alsa-lib/src/pcm/pcm_plug.c	17 Sep 2002 16:13:12 -0000	1.72
+++ alsa-lib/src/pcm/pcm_plug.c	23 Jan 2003 18:28:24 -0000
@@ -70,6 +70,8 @@
 		return -EINVAL;
 	}
 	if (plug->close_slave) {
+		snd_pcm_unlink_hw_ptr(pcm, plug->req_slave);
+		snd_pcm_unlink_appl_ptr(pcm, plug->req_slave);
 		err = snd_pcm_close(plug->req_slave);
 		if (err < 0)
 			result = err;
@@ -313,6 +315,8 @@
 	snd_pcm_t *slave = plug->req_slave;
 	/* Clear old plugins */
 	if (plug->slave != slave) {
+		snd_pcm_unlink_hw_ptr(pcm, plug->slave);
+		snd_pcm_unlink_appl_ptr(pcm, plug->slave);
 		snd_pcm_close(plug->slave);
 		plug->slave = slave;
 		pcm->fast_ops = slave->fast_ops;