applied patch #674141: CMI: Smush sync tuning

svn-id: r6537

5 files changed, 7 insertions, 7 deletions

diff --git a/common/timer.cpp b/common/timer.cpp
index 1cb4dda6c6..568a27a673 100644
--- a/common/timer.cpp
+++ b/common/timer.cpp
@@ -48,7 +48,7 @@ int Timer::handler(int * t) {
 	if (_timerRunning) {
 		_lastTime = _thisTime;
 		_thisTime = _engine->_system->get_msecs();
-		interval = _thisTime - _lastTime;
+		interval = 1000 * (_thisTime - _lastTime);
 
 		for (l = 0; l < MAX_TIMERS; l++) {
 			if ((_timerSlots[l].procedure) && (_timerSlots[l].interval > 0)) {
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp
index 92fab59a5c..4a930d031e 100644
--- a/scumm/imuse_digi.cpp
+++ b/scumm/imuse_digi.cpp
@@ -44,7 +44,7 @@ IMuseDigital::IMuseDigital(Scumm *scumm) {
 		_channel[l]._initialized = false;
 	}
 	_scumm->_mixer->beginSlots(MAX_DIGITAL_CHANNELS + 1);
-	_scumm->_timer->installProcedure(imus_digital_handler, 200);
+	_scumm->_timer->installProcedure(imus_digital_handler, 200000);
 	_pause = false;
 }
 
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index fb2727d340..423ea13229 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -2482,11 +2482,11 @@ void Scumm_v6::o6_kernelSetFunctions()
 //				}
 				uint32 speed;
 				if (strcmp((char*)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0)
-	 				speed = 71;
+	 				speed = 71000;
 				else {
 					if (_smushFrameRate == 0) 
 						_smushFrameRate = 14;
-					speed = 1000 / _smushFrameRate;
+					speed = 1000000 / _smushFrameRate;
 				}
 				
 				debug(1, "INSANE Arg: %d", args[1]);
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 14871394d0..c87f674f41 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1368,7 +1368,7 @@ void Scumm_v8::o8_startVideo()
 	
 	warning("o8_startVideo(%s/%s)", getGameDataPath(), (char*)_scriptPointer);
 	
-	ScummRenderer * sr = new ScummRenderer(this, 83);
+	ScummRenderer * sr = new ScummRenderer(this, 83333);
 	SmushPlayer * sp = new SmushPlayer(sr);
 
 	if (_noSubtitles)
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 9a7b6b941c..3a8fd9c9c5 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -993,7 +993,7 @@ void Sound::playBundleMusic(char * song) {
 		_bundleMusicTrack = -1;
 		_numberSamplesBundleMusic = _scumm->_bundle->getNumberOfMusicSamplesByName(song);
 		_nameBundleMusic = song;
-		_scumm->_timer->installProcedure(&music_handler, 1000);
+		_scumm->_timer->installProcedure(&music_handler, 1000000);
 		return;
 	}
 	if (strcmp(_nameBundleMusic, song) != 0) {
@@ -1376,7 +1376,7 @@ void Sound::startCDTimer()
 
 	_scumm->_timer->releaseProcedure(&cd_timer_handler);
 	_cd_timer_value = _scumm->_vars[_scumm->VAR_MI1_TIMER];
-	_scumm->_timer->installProcedure(&cd_timer_handler, timer_interval);
+	_scumm->_timer->installProcedure(&cd_timer_handler, 1000 * timer_interval);
 }
 
 void Sound::stopCDTimer()