libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: rename audio and video track access functions

Browse Source
This commit is contained in:
Strangerke 2014-03-09 21:48:40 +01:00
parent 118e7395c3
commit 864b97eb49
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/voyeur/animation.cpp
View File

@ -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()) {

4
engines/voyeur/animation.h
View File

@ -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

2
engines/voyeur/voyeur_game.cpp
View File

@ -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));