# HG changeset patch
# User anders
# Date 1006774235 0
# Node ID b9ee2d8d72793386498c79c93834ad8043b7b88c
# Parent  b196b915fdc4c5945537e67a5fff7f3ac3562033
Audio delay bugfix

diff -r b196b915fdc4 -r b9ee2d8d7279 libao2/ao_oss.c
--- a/libao2/ao_oss.c	Mon Nov 26 02:20:51 2001 +0000
+++ b/libao2/ao_oss.c	Mon Nov 26 11:30:35 2001 +0000
@@ -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;
 
diff -r b196b915fdc4 -r b9ee2d8d7279 libao2/ao_sdl.c
--- a/libao2/ao_sdl.c	Mon Nov 26 02:20:51 2001 +0000
+++ b/libao2/ao_sdl.c	Mon Nov 26 11:30:35 2001 +0000
@@ -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;
 	
diff -r b196b915fdc4 -r b9ee2d8d7279 libao2/ao_sun.c
--- a/libao2/ao_sun.c	Mon Nov 26 02:20:51 2001 +0000
+++ b/libao2/ao_sun.c	Mon Nov 26 11:30:35 2001 +0000
@@ -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;
 }