Ticket #2883: smush2.diff

engines/scumm/intern.h

@@ -589 +589 @@
          */
         bool _smushVideoShouldFinish;
 
-        /** This flag is a hack to allow the pause dialog to pause SMUSH playback, too. */
-        bool _smushPaused;
-
         bool _smushActive;
 
         Insane *_insane;

engines/scumm/scumm.cpp

@@ -773 +773 @@
 
         _smushFrameRate = 0;
         _smushVideoShouldFinish = false;
-        _smushPaused = false;
         _smushActive = false;
         _insaneRunning = false;
         _smixer = NULL;
@@ -2098 +2097 @@
 
 #ifndef DISABLE_SCUMM_7_8
 int ScummEngine_v7::runDialog(Dialog &dialog) {
-        bool oldSmushPaused = _smushPaused;
-        _smushPaused = true;
-
+        _splayer->pause();
         int result = ScummEngine::runDialog(dialog);
-
-        _smushPaused = oldSmushPaused;
-
+        _splayer->unpause();
         return result;
 }
 #endif

engines/scumm/smush/smush_player.cpp

@@ -27 +27 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/system.h"
-#include "common/timer.h"
 #include "common/util.h"
 
 #include "graphics/cursorman.h"
@@ -220 +219 @@
         return sr;
 }
 
-void SmushPlayer::timerCallback(void *refCon) {
-        SmushPlayer *sp = (SmushPlayer *)refCon;
-        sp->parseNextFrame();
+void SmushPlayer::timerCallback() {
+        parseNextFrame();
 #ifdef _WIN32_WCE
-        sp->_inTimer = true;
-        sp->_inTimerCount++;
+        _inTimer = true;
+        _inTimerCount++;
 #endif
 #ifdef __SYMBIAN32__
         if (sp->_closeOnTextTick) {
@@ -267 +265 @@
         _skipPalette = false;
         _IACTstream = NULL;
         _smixer = _vm->_smixer;
+        _paused = false;
+        _pauseStartTime = 0;
+        _pauseTime = 0;
 #ifdef _WIN32_WCE
         _inTimer = false;
         _inTimerCount = 0;
@@ -307 +308 @@
         _vm->_mixer->stopHandle(_IACTchannel);
         _vm->_smixer->stop();
 
-        _vm->_timer->installTimerProc(&timerCallback, 1000000 / _speed, this);
-
         _initDone = true;
 }
 
@@ -322 +321 @@
                 User::After(15624); 
         }
 #endif
-        _vm->_timer->removeTimerProc(&timerCallback);
 
         _vm->_smushVideoShouldFinish = true;
 
@@ -1075 +1073 @@
 
         Chunk *sub;
 
-        if (_vm->_smushPaused)
-                return;
-
         if (_seekPos >= 0) {
                 if (_smixer)
                         _smixer->stop();
@@ -1274 +1269 @@
 #endif
 }
 
+void SmushPlayer::pause() {
+        if (!_paused) {
+                _paused = true;
+                _pauseStartTime = _vm->_system->getMillis();
+        }
+}
+
+void SmushPlayer::unpause() {
+        if (_paused) {
+                _paused = false;
+                _pauseTime += (_vm->_system->getMillis() - _pauseStartTime);
+                _pauseStartTime = 0;
+        }
+}
+
 void SmushPlayer::play(const char *filename, int32 speed, int32 offset, int32 startFrame) {
-
         // Verify the specified file exists
         ScummFile f;
         _vm->openFile(f, filename);
@@ -1302 +1311 @@
         setupAnim(filename);
         init(speed);
 
+        uint32 startTime = _vm->_system->getMillis();
+
+        _pauseTime = 0;
+        uint frameNo = 0;
+
         for (;;) {
+                uint32 now = _vm->_system->getMillis() - _pauseTime;
+                uint32 elapsed = now - startTime;
+
+                // TODO: Sync to elapsed sound playing time, if possible.
+                // TODO: Frame skipping. (Decode, but don't update screen.)
+
+                if (elapsed >= (frameNo * 1000) / _speed) {
+                        timerCallback();
+                }
+
                 if (_warpNeeded) {
                         _vm->_system->warpMouse(_warpX, _warpY);
                         _warpNeeded = false;
@@ -1345 +1369 @@
                         _inTimer = false;
                         _inTimerCount = 0;
 #endif
+                        frameNo++;
                 }
                 if (_endOfFile)
                         break;

engines/scumm/smush/smush_player.h

@@ -97 +97 @@
         SmushPlayer(ScummEngine_v7 *scumm);
         ~SmushPlayer();
 
+        void pause();
+        void unpause();
+
         void play(const char *filename, int32 speed, int32 offset = 0, int32 startFrame = 0);
         void release();
         void warpMouse(int x, int y, int buttons);
@@ -106 +109 @@
         int _width, _height;
 
         int _origPitch, _origNumStrips;
+        bool _paused;
+        uint32 _pauseStartTime;
+        uint32 _pauseTime;
 
         void insanity(bool);
         void setPalette(const byte *palette);
@@ -139 +145 @@
         void handleDeltaPalette(Chunk &);
         void readPalette(byte *, Chunk &);
 
-        static void timerCallback(void *ptr);
+        void timerCallback();
 };
 
 } // End of namespace Scumm