diff options
| author | Matthew Hoops | 2012-07-26 23:44:40 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-07-26 23:45:05 -0400 |
| commit | 1f67c9dbbed5e92d8b9cb8f4d729366463a05937 (patch) | |
| tree | e795ce66c6792867253a7d6de57da09be7f315dd /video | |
| parent | df5d6f7d08c30afa270fd7d3e2d0f885eaf3c7bc (diff) | |
| download | scummvm-rg350-1f67c9dbbed5e92d8b9cb8f4d729366463a05937.tar.gz scummvm-rg350-1f67c9dbbed5e92d8b9cb8f4d729366463a05937.tar.bz2 scummvm-rg350-1f67c9dbbed5e92d8b9cb8f4d729366463a05937.zip | |
VIDEO: Reset pause time when seeking/rewinding
Diffstat (limited to 'video')
| -rw-r--r-- | video/video_decoder.cpp | 2 | ||||
| -rw-r--r-- | video/video_decoder.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp index 9d6d40f7fb..77eab3a6e1 100644 --- a/video/video_decoder.cpp +++ b/video/video_decoder.cpp @@ -280,6 +280,7 @@ bool AdvancedVideoDecoder::rewind() { _audioStartOffset = 0; _startTime = g_system->getMillis(); + resetPauseStartTime(); return true; } @@ -314,6 +315,7 @@ bool AdvancedVideoDecoder::seek(const Audio::Timestamp &time) { _audioStartOffset = time; _startTime = g_system->getMillis() - time.msecs(); + resetPauseStartTime(); _needsUpdate = true; return true; } diff --git a/video/video_decoder.h b/video/video_decoder.h index ffeecd326d..f0427668a6 100644 --- a/video/video_decoder.h +++ b/video/video_decoder.h @@ -249,7 +249,6 @@ protected: /** * Reset the pause start time (which should be called when seeking) - * @note This function is now deprecated. There is no replacement. */ void resetPauseStartTime(); |