diff options
| author | Matthew Hoops | 2012-05-25 00:21:51 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-05-25 00:35:38 -0400 |
| commit | f1f6a82cd57fceb52afdd393f44a80c40f3c9a15 (patch) | |
| tree | 06a04072df44bd5f337ff79b43684d8109a72f59 /engines/mohawk/video.cpp | |
| parent | b2506abccf6aa64da31b497b45fe0e1949530053 (diff) | |
| parent | beef27fc10bb714fe37f2ee0c35cd143dc706829 (diff) | |
| download | scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.gz scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.bz2 scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/mohawk/video.cpp')
| -rw-r--r-- | engines/mohawk/video.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index 80fa4bf9a0..83fca9ac35 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -49,7 +49,7 @@ void VideoEntry::clear() { } bool VideoEntry::endOfVideo() { - return !video || video->endOfVideo() || video->getElapsedTime() >= (uint)end.msecs(); + return !video || video->endOfVideo() || video->getTime() >= (uint)end.msecs(); } VideoManager::VideoManager(MohawkEngine* vm) : _vm(vm) { @@ -481,9 +481,9 @@ uint32 VideoManager::getFrameCount(VideoHandle handle) { return _videoStreams[handle]->getFrameCount(); } -uint32 VideoManager::getElapsedTime(VideoHandle handle) { +uint32 VideoManager::getTime(VideoHandle handle) { assert(handle != NULL_VID_HANDLE); - return _videoStreams[handle]->getElapsedTime(); + return _videoStreams[handle]->getTime(); } uint32 VideoManager::getDuration(VideoHandle handle) { |