diff options
| author | Tobia Tesan | 2014-02-20 20:00:14 +0100 |
|---|---|---|
| committer | Tobia Tesan | 2014-10-15 21:36:46 +0200 |
| commit | 4742acf9395d069d8e9ee1752c3f8f09c1034b08 (patch) | |
| tree | 4b61bd92e8ac7535364f91929a72cfebd9c5900f | |
| parent | 1a571d9611ea21040f7b5ff971fcd7b70580a025 (diff) | |
| download | scummvm-rg350-4742acf9395d069d8e9ee1752c3f8f09c1034b08.tar.gz scummvm-rg350-4742acf9395d069d8e9ee1752c3f8f09c1034b08.tar.bz2 scummvm-rg350-4742acf9395d069d8e9ee1752c3f8f09c1034b08.zip | |
WINTERMUTE: Rename VideoTheoraPlayer->_subtitles to _foundSubtitles for clarity
| -rw-r--r-- | engines/wintermute/video/video_theora_player.cpp | 12 | ||||
| -rw-r--r-- | engines/wintermute/video/video_theora_player.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp index d16b2edb8c..99fce7b6ad 100644 --- a/engines/wintermute/video/video_theora_player.cpp +++ b/engines/wintermute/video/video_theora_player.cpp @@ -86,7 +86,7 @@ void VideoTheoraPlayer::SetDefaults() { _theoraDecoder = nullptr; _subtitler = new VideoSubtitler(_gameRef); - _subtitles = false; + _foundSubtitles = false; } ////////////////////////////////////////////////////////////////////////// @@ -134,10 +134,10 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common: if (_subtitler->loadSubtitles(_filename, subtitleFile)) { // We have subtitles - _subtitles = true; + _foundSubtitles = true; } else { // We couldn't load subtitles... - _subtitles = false; + _foundSubtitles = false; } _theoraDecoder->loadStream(_file); @@ -224,7 +224,7 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame, _state = THEORA_STATE_PLAYING; _looping = looping; _playbackType = type; - if (_subtitler && _subtitles && _gameRef->_subtitles) { + if (_subtitler && _foundSubtitles && _gameRef->_subtitles) { _subtitler->update(_theoraDecoder->getFrameCount()); _subtitler->display(); } @@ -302,7 +302,7 @@ bool VideoTheoraPlayer::update() { } if (_theoraDecoder) { - if (_subtitler && _subtitles && _gameRef->_subtitles) { + if (_subtitler && _foundSubtitles && _gameRef->_subtitles) { _subtitler->update(_theoraDecoder->getCurFrame()); } @@ -430,7 +430,7 @@ bool VideoTheoraPlayer::display(uint32 alpha) { res = STATUS_FAILED; } - if (_subtitler && _subtitles && _gameRef->_subtitles) { + if (_subtitler && _foundSubtitles && _gameRef->_subtitles) { _subtitler->display(); } return res; diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h index 48f75efd20..0b9b3d487a 100644 --- a/engines/wintermute/video/video_theora_player.h +++ b/engines/wintermute/video/video_theora_player.h @@ -138,7 +138,7 @@ private: bool _playbackStarted; - bool _subtitles; + bool _foundSubtitles; // helpers void SetDefaults(); |