Ticket #8166: cmi-smushsync.diff

scummvm/common/timer.cpp

@@ -48 +48 @@
         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)) {

scummvm/scumm/imuse_digi.cpp

@@ -44 +44 @@
                 _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;
 }
 

scummvm/scumm/script_v6.cpp

@@ -2482 +2482 @@
 //                              }
                                 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]);

scummvm/scumm/script_v8.cpp

@@ -1368 +1368 @@
         
         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)

scummvm/scumm/sound.cpp

@@ -993 +993 @@
                 _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 +1376 @@
 
         _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()