[alsa-cvslog] CVS: alsa-driver/lowlevel/gus gus_pcm.c,1.110,1.111

[Jaroslav K. <pe...@us...>]

Update of /cvsroot/alsa/alsa-driver/lowlevel/gus
In directory usw-pr-cvs1:/tmp/cvs-serv8519

Modified Files:
	gus_pcm.c 
Log Message:
Fixed capture setup for interwave

Index: gus_pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/lowlevel/gus/gus_pcm.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gus_pcm.c	2001/06/24 23:12:44	1.110
+++ gus_pcm.c	2001/08/20 09:20:02	1.111
@@ -837,16 +837,17 @@
 	snd_kcontrol_t *kctl;
 	snd_pcm_t *pcm;
 	snd_pcm_substream_t *substream;
-	int err;
+	int capture, err;
 
 	if (rpcm)
 		*rpcm = NULL;
 	card = gus->card;
+	capture = !gus->interwave && !gus->ess_flag && !gus->ace_flag ? 1 : 0;
 	err = snd_pcm_new(card,
 			  gus->interwave ? "AMD InterWave" : "GF1",
 			  pcm_dev,
 			  gus->gf1.pcm_channels / 2,
-			  !gus->interwave && !gus->ess_flag ? 1 : 0,
+			  capture,
 			  &pcm);
 	if (err < 0)
 		return err;
@@ -860,8 +861,7 @@
 	
 	pcm->info_flags = 0;
 	pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
-	if (gus->interwave && !gus->ess_flag && !gus->ace_flag) {
-		/* capture setup */
+	if (capture) {
 		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_gf1_pcm_capture_ops);
 		if (gus->gf1.dma2 == gus->gf1.dma1)
 			pcm->info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX;