[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.21,1.22

Max Horn fingolfin at users.sourceforge.net
Mon Aug 4 09:29:08 CEST 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv363/sound

Modified Files:
	audiostream.cpp 
Log Message:
fixed EOF handling of MP3 streams (subtract time from duration timer, instead of adding it...)

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- audiostream.cpp	2 Aug 2003 18:13:37 -0000	1.21
+++ audiostream.cpp	4 Aug 2003 16:28:41 -0000	1.22
@@ -289,8 +289,8 @@
 	// Subtract the duration of this frame from the time left to play
 	mad_timer_t frame_duration = _frame.header.duration;
 	mad_timer_negate(&frame_duration);
-	mad_timer_add(&_duration, _frame.header.duration);
-	
+	mad_timer_add(&_duration, frame_duration);
+
 	if (mad_timer_compare(_duration, mad_timer_zero) <= 0)
 		_size = -1;	// Mark for EOF
 	





More information about the Scummvm-git-logs mailing list