[Scummvm-cvs-logs] SF.net SVN: scummvm:[47243] scummvm/trunk/engines/made/scriptfuncs.cpp

[fingolfin at users.sourceforge.net]

Revision: 47243
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47243&view=rev
Author:   fingolfin
Date:     2010-01-11 10:17:23 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
MADE: Use Mixer::getElapsedTime and Audio::Timestamp instead of Mixer::getSoundElapsedTime

Modified Paths:
--------------
    scummvm/trunk/engines/made/scriptfuncs.cpp

Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp	2010-01-11 09:34:20 UTC (rev 47242)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp	2010-01-11 10:17:23 UTC (rev 47243)
@@ -652,7 +652,8 @@
 	if (_vm->_mixer->isSoundHandleActive(_audioStreamHandle) && _vm->_soundEnergyArray) {
 		while (_vm->_soundEnergyIndex < _vm->_soundEnergyArray->size()) {
 			SoundEnergyItem *soundEnergyItem = &(*_vm->_soundEnergyArray)[_vm->_soundEnergyIndex];
-			if (((_vm->_soundRate / 1000) * _vm->_mixer->getSoundElapsedTime(_audioStreamHandle)) < soundEnergyItem->position) {
+			const Audio::Timestamp ts = _vm->_mixer->getElapsedTime(_audioStreamHandle);
+			if (ts.convertToFramerate(_vm->_soundRate).totalNumberOfFrames() < soundEnergyItem->position) {
 				result = soundEnergyItem->energy;
 				break;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.