[Scummvm-cvs-logs] scummvm master -> 864b97eb49a96a6d490611ac81109410b4a140d5

Strangerke Strangerke at scummvm.org
Sun Mar 9 21:50:27 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
864b97eb49 VOYEUR: rename audio and video track access functions


Commit: 864b97eb49a96a6d490611ac81109410b4a140d5
    https://github.com/scummvm/scummvm/commit/864b97eb49a96a6d490611ac81109410b4a140d5
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-09T21:48:40+01:00

Commit Message:
VOYEUR: rename audio and video track access functions

Changed paths:
    engines/voyeur/animation.cpp
    engines/voyeur/animation.h
    engines/voyeur/voyeur_game.cpp



diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index f6c1b20..20af780 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 9480c66..b17e998 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 b4e6ec7..64901ef 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));
 






More information about the Scummvm-git-logs mailing list