libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-29 13:16:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINTERMUTE: Rename VideoTheoraPlayer->_subtitles to _foundSubtitles for clarity

Browse Source
This commit is contained in:
Tobia Tesan 2014-02-20 20:00:14 +01:00
parent 1a571d9611
commit 4742acf939
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/wintermute/video/video_theora_player.cpp
View File

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

2
engines/wintermute/video/video_theora_player.h
View File

@ -138,7 +138,7 @@ private:
bool _playbackStarted;
bool _subtitles;
bool _foundSubtitles;
// helpers
void SetDefaults();