[Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,1.12,1.13

[Max Horn]

Update of /cvsroot/scummvm/scummvm/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26937/graphics

Modified Files:
	animation.cpp 
Log Message:
Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing some very specialised methods

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- animation.cpp	28 Sep 2004 20:19:25 -0000	1.12
+++ animation.cpp	27 Nov 2004 15:58:06 -0000	1.13
@@ -174,7 +174,7 @@
 					return false;
 
 				if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
-					((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) ||
+					((_snd->getSoundElapsedTime(bgSound) * 12) / 1000 < framenum + 1) ||
 					frameskipped > 10) {
 					if (frameskipped > 10) {
 						warning("force frame %i redraw", framenum);
@@ -183,7 +183,7 @@
 					drawYUV(sequence_i->width, sequence_i->height, info->display_fbuf->buf);
 
 					if (bgSoundStream) {
-						while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum)
+						while ((_snd->getSoundElapsedTime(bgSound) * 12) / 1000 < framenum)
 							_sys->delayMillis(10);
 					} else {
 						ticks += 83;