[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.79,1.80

Max Horn fingolfin at users.sourceforge.net
Thu Dec 25 07:28:01 CET 2003


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

Modified Files:
	imuse_digi.cpp 
Log Message:
cleanup

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- imuse_digi.cpp	25 Dec 2003 15:19:49 -0000	1.79
+++ imuse_digi.cpp	25 Dec 2003 15:27:19 -0000	1.80
@@ -1407,7 +1407,11 @@
 		return;
 	}
 
-	_bundleSongPosInMs = (_bundleMusicPosition * 5) / (_outputMixerSize / 200);
+	// Compute the position in the song in milliseconds (in brief: _outputMixerSize
+	// gives the number of bytes used for one second, so if we compute the value of
+	// (_bundleMusicPosition / _outputMixerSize), that is an offset in seconds;
+	// multiplying that by 1000 gives milliseconds).
+	_bundleSongPosInMs = 1000 * _bundleMusicPosition / _outputMixerSize;
 	_bundleMusicPosition += final_size;
 	if (!_bundleMusicTrack.isActive())
 		_scumm->_mixer->newStream(&_bundleMusicTrack, rate, SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, 300000);





More information about the Scummvm-git-logs mailing list