[Mplayer-cvslog] CVS: main/libmpdemux ai_oss.c,1.7,1.8

[Attila Kinali CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv4774

Modified Files:
	ai_oss.c 
Log Message:
fix some 10ls in sample rate handlin
patch by Josef Zlomek <josef.zlomek at email.cz>


Index: ai_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/ai_oss.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ai_oss.c	11 Jan 2004 10:01:18 -0000	1.7
+++ ai_oss.c	29 Jan 2004 12:43:54 -0000	1.8
@@ -46,6 +46,7 @@
 		   ai->req_channels);
 	    return -1;
 	}
+	ai->channels = ioctl_param;
     }
     else
     {
@@ -58,8 +59,8 @@
 		   ai->req_channels == 2);
 	    return -1;
 	}
+	ai->channels = ioctl_param ? 2 : 1;
     }
-    ai->channels = ai->req_channels;
     return 0;
 }
 
@@ -102,7 +103,7 @@
 	       ai->req_samplerate);
 	return -1;
     }
-    ai->samplerate = ai->req_samplerate;
+    ai->samplerate = ioctl_param;
 
     mp_msg(MSGT_TV, MSGL_V, "ioctl dsp trigger: %d\n",
 	   ioctl(ai->oss.audio_fd, SNDCTL_DSP_GETTRIGGER, &ioctl_param));