WINTERMUTE: Improve const-usage in VideoTheoraPlayer.

2 files changed, 23 insertions, 24 deletions

diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 18498bfb41..3777eede10 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -335,7 +335,7 @@ bool VideoTheoraPlayer::update() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-uint32 VideoTheoraPlayer::getMovieTime() {
+uint32 VideoTheoraPlayer::getMovieTime() const {
 	if (!_playbackStarted) {
 		return 0;
 	} else {
@@ -432,7 +432,7 @@ bool VideoTheoraPlayer::setAlphaImage(const Common::String &filename) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-byte VideoTheoraPlayer::getAlphaAt(int x, int y) {
+byte VideoTheoraPlayer::getAlphaAt(int x, int y) const {
 	if (_alphaImage) {
 		return _alphaImage->getAlphaAt(x, y);
 	} else {
@@ -525,7 +525,7 @@ bool VideoTheoraPlayer::initializeSimple() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-BaseSurface *VideoTheoraPlayer::getTexture() {
+BaseSurface *VideoTheoraPlayer::getTexture() const {
 	return _texture;
 }
 
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
index 7a6742271c..91ba2453bc 100644
--- a/engines/wintermute/video/video_theora_player.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -72,64 +72,63 @@ public:
 	bool pause();
 	bool resume();
 
-	bool isPlaying()  {
+	bool isPlaying() const {
 		return _state == THEORA_STATE_PLAYING;
 	};
-	bool isFinished() {
+	bool isFinished() const {
 		return _state == THEORA_STATE_FINISHED;
 	};
-	bool isPaused()   {
+	bool isPaused() const {
 		return _state == THEORA_STATE_PAUSED;
 	};
 
-	uint32 getMovieTime();
-
-	BaseSurface *getTexture();
-
-	int _state;
-	uint32 _startTime;
-
-	int _savedState;
-	uint32 _savedPos;
+	uint32 getMovieTime() const;
 
+	BaseSurface *getTexture() const;
 
 	// alpha related
 	BaseImage *_alphaImage;
 	Common::String _alphaFilename;
 	bool setAlphaImage(const Common::String &filename);
-	__inline byte getAlphaAt(int x, int y);
+	__inline byte getAlphaAt(int x, int y) const;
 	void writeAlpha();
 
 	bool seekToTime(uint32 Time);
 
-
 	void cleanup();
 	bool resetStream();
 
 	// video properties
-	TVideoPlayback _playbackType;
 	int _posX;
 	int _posY;
+	
+	bool _dontDropFrames;
+private:
+	int _state;
+	uint32 _startTime;
+
+	int _savedState;
+	uint32 _savedPos;
+
+	// video properties
+	TVideoPlayback _playbackType;
+	bool _looping;
 	float _playZoom;
 	int _volume;
 
-	bool _looping;
-	bool _dontDropFrames;
 	bool _freezeGame;
 	uint32 _currentTime;
 
-
-private:
 	// seeking support
 	bool _seekingKeyframe;
 	float _timeOffset;
 
 	bool _frameRendered;
 
-	bool getIsFrameReady() {
+	bool getIsFrameReady() const {
 		return _videoFrameReady;
 	}
-private:
+
 	bool _audioFrameReady;
 	bool _videoFrameReady;
 	float _videobufTime;