diff options
| author | Strangerke | 2014-03-09 21:48:40 +0100 |
|---|---|---|
| committer | Strangerke | 2014-03-09 21:48:40 +0100 |
| commit | 864b97eb49a96a6d490611ac81109410b4a140d5 (patch) | |
| tree | 98123f428b9df4eeb90fd5e34e71f342aad8fad2 | |
| parent | 118e7395c3cdcc8eb086cc83d094ee8199d44224 (diff) | |
| download | scummvm-rg350-864b97eb49a96a6d490611ac81109410b4a140d5.tar.gz scummvm-rg350-864b97eb49a96a6d490611ac81109410b4a140d5.tar.bz2 scummvm-rg350-864b97eb49a96a6d490611ac81109410b4a140d5.zip | |
VOYEUR: rename audio and video track access functions
| -rw-r--r-- | engines/voyeur/animation.cpp | 4 | ||||
| -rw-r--r-- | engines/voyeur/animation.h | 4 | ||||
| -rw-r--r-- | engines/voyeur/voyeur_game.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp index f6c1b20cef..20af780755 100644 --- a/engines/voyeur/animation.cpp +++ b/engines/voyeur/animation.cpp @@ -115,7 +115,7 @@ void RL2Decoder::copyDirtyRectsToBuffer(uint8 *dst, uint pitch) { void RL2Decoder::readNextPacket() { int frameNumber = getCurFrame(); - RL2AudioTrack *audioTrack = RL2Decoder::getAudioTrack(); + RL2AudioTrack *audioTrack = getRL2AudioTrack(); // Handle queueing sound data if (_soundFrameNumber == -1) @@ -464,7 +464,7 @@ void RL2Decoder::play(VoyeurEngine *vm, int resourceOffset, int paletteStart = getPaletteStart(); int paletteCount = getPaletteCount(); - PictureResource videoFrame(getVideoTrack()->getBackSurface()); + PictureResource videoFrame(getRL2VideoTrack()->getBackSurface()); int picCtr = 0; while (!vm->shouldQuit() && !endOfVideo() && !vm->_eventsManager->_mouseClicked) { if (hasDirtyPalette()) { diff --git a/engines/voyeur/animation.h b/engines/voyeur/animation.h index 9480c66222..b17e998214 100644 --- a/engines/voyeur/animation.h +++ b/engines/voyeur/animation.h @@ -186,8 +186,8 @@ public: * @param imgPos Position to draw image data */ void play(VoyeurEngine *vm, int resourceOffset = 0, byte *frames = NULL, byte *imgPos = NULL); - RL2VideoTrack *getVideoTrack() { return _videoTrack; } - virtual RL2AudioTrack *getAudioTrack() { return _audioTrack; } + RL2VideoTrack *getRL2VideoTrack() { return _videoTrack; } + RL2AudioTrack *getRL2AudioTrack() { return _audioTrack; } }; } // End of namespace Voyeur diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp index b4e6ec7a52..64901ef101 100644 --- a/engines/voyeur/voyeur_game.cpp +++ b/engines/voyeur/voyeur_game.cpp @@ -751,7 +751,7 @@ void VoyeurEngine::doGossip() { pal->startFade(); // Transfer initial background to video decoder - PictureResource videoFrame(decoder.getVideoTrack()->getBackSurface()); + PictureResource videoFrame(decoder.getRL2VideoTrack()->getBackSurface()); bgPic->_bounds.moveTo(0, 0); _graphicsManager->sDrawPic(bgPic, &videoFrame, Common::Point(0, 0)); |