diff options
| author | Bastien Bouclet | 2017-07-09 15:01:52 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2017-07-22 20:38:56 +0200 |
| commit | c5496e32068a24c53b6a9f0e633d4e0321c3c831 (patch) | |
| tree | 2ea470e44e8f3711300361b131d03b100b155beb /engines/mohawk/livingbooks.cpp | |
| parent | 0b9bfb3d3c71df7c011754a2f7b98e32e023dc3e (diff) | |
| download | scummvm-rg350-c5496e32068a24c53b6a9f0e633d4e0321c3c831.tar.gz scummvm-rg350-c5496e32068a24c53b6a9f0e633d4e0321c3c831.tar.bz2 scummvm-rg350-c5496e32068a24c53b6a9f0e633d4e0321c3c831.zip | |
MOHAWK: Get rid of VideoHandle
Diffstat (limited to 'engines/mohawk/livingbooks.cpp')
| -rw-r--r-- | engines/mohawk/livingbooks.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index 340dfd16f7..95b4722d81 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -3828,8 +3828,8 @@ LBMovieItem::~LBMovieItem() { void LBMovieItem::update() { if (_playing) { - VideoHandle videoHandle = _vm->_video->findVideoHandle(_resourceId); - if (!videoHandle || videoHandle->endOfVideo()) + VideoEntryPtr video = _vm->_video->findVideo(_resourceId); + if (!video || video->endOfVideo()) done(true); } @@ -3840,11 +3840,11 @@ bool LBMovieItem::togglePlaying(bool playing, bool restart) { if (playing) { if ((_loaded && _enabled && _globalEnabled) || _phase == kLBPhaseNone) { debug("toggled video for phase %d", _phase); - VideoHandle handle = _vm->_video->playMovie(_resourceId); - if (!handle) + VideoEntryPtr video = _vm->_video->playMovie(_resourceId); + if (!video) error("Failed to open tMOV %d", _resourceId); - handle->moveTo(_rect.left, _rect.top); + video->moveTo(_rect.left, _rect.top); return true; } } |