[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.187,1.188

Max Horn fingolfin at users.sourceforge.net
Mon Jul 28 19:11:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2317

Modified Files:
	sound.cpp 
Log Message:
Added FIXME

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- sound.cpp	25 Jul 2003 01:19:13 -0000	1.187
+++ sound.cpp	29 Jul 2003 00:05:19 -0000	1.188
@@ -1791,19 +1791,19 @@
 
 	// Calc offset. As all bitrates are in kilobit per seconds, the division by 200 is always exact
 	offset = (startFrame * (_mad_header.bitrate / (8 * 25))) / 3;
+	_file->seek(offset, SEEK_SET);
 
 	// Calc delay
 	if (!duration) {
+		// FIXME: Using _size here is a problem if offset (or equivalently
+		// startFrame) is non-zero.
 		mad_timer_set(&durationTime, (_size * 8) / _mad_header.bitrate,
 		              (_size * 8) % _mad_header.bitrate, _mad_header.bitrate);
 	} else {
 		mad_timer_set(&durationTime, duration / 75, duration % 75, 75);
-	}	
-
-printf("startFrame %d, duration %d\n", startFrame, duration);
-	// Go
-	_file->seek(offset, SEEK_SET);
+	}
 
+	// Play it
 	return mixer->playMP3CDTrack(NULL, _file, durationTime);
 }
 





More information about the Scummvm-git-logs mailing list