[Mplayer-cvslog] CVS: main/libao2 ao_oss.c,1.12,1.13 ao_sdl.c,1.14,1.15 ao_sun.c,1.10,1.11

[Anders Johansson]

Update of /cvsroot/mplayer/main/libao2
In directory mplayer:/var/tmp.root/cvs-serv1553

Modified Files:
	ao_oss.c ao_sdl.c ao_sun.c 
Log Message:
Audio delay bugfix

Index: ao_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ao_oss.c	24 Nov 2001 05:21:22 -0000	1.12
+++ ao_oss.c	26 Nov 2001 11:30:35 -0000	1.13
@@ -110,7 +110,7 @@
     return 0;
   }
 
-  ao_data.bps=(channels+1)*rate;
+  ao_data.bps=channels*rate;
   if(format != AFMT_U8 && format != AFMT_S8)
     ao_data.bps*=2;
 

Index: ao_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sdl.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ao_sdl.c	24 Nov 2001 05:21:22 -0000	1.14
+++ ao_sdl.c	26 Nov 2001 11:30:35 -0000	1.15
@@ -144,7 +144,7 @@
 		printf("SDL: using %s audio driver\n", ao_subdevice);
 	}
 
-	ao_data.bps=(channels+1)*rate;
+	ao_data.bps=channels*rate;
 	if(format != AFMT_U8 && format != AFMT_S8)
 	  ao_data.bps*=2;
 	

Index: ao_sun.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sun.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ao_sun.c	24 Nov 2001 05:21:22 -0000	1.10
+++ ao_sun.c	26 Nov 2001 11:30:35 -0000	1.11
@@ -459,6 +459,6 @@
     if (info.play.samples && enable_sample_timing == RTSC_ENABLED)
 	return (float)(queued_samples - info.play.samples) / (float)byte_per_sec;
     else
-	return (flaot)((queued_bursts - info.play.eof) * ao_data.outburst) / (float)byte_per_sec;
+	return (float)((queued_bursts - info.play.eof) * ao_data.outburst) / (float)byte_per_sec;
 }