diff options
| author | Tobia Tesan | 2014-10-14 23:00:34 +0200 |
|---|---|---|
| committer | Tobia Tesan | 2014-10-15 20:08:21 +0200 |
| commit | 6f6e49f4cf183d9cbdf75060f4c271a538c6d1d1 (patch) | |
| tree | 152e36e19767ecd0e27c9e90ac87a71d99e4c4eb /engines/wintermute/video | |
| parent | 532217bcee6ee33a189f71e6c37323442299c4e2 (diff) | |
| download | scummvm-rg350-6f6e49f4cf183d9cbdf75060f4c271a538c6d1d1.tar.gz scummvm-rg350-6f6e49f4cf183d9cbdf75060f4c271a538c6d1d1.tar.bz2 scummvm-rg350-6f6e49f4cf183d9cbdf75060f4c271a538c6d1d1.zip | |
WINTERMUTE: Display subtitles in console
Diffstat (limited to 'engines/wintermute/video')
| -rw-r--r-- | engines/wintermute/video/video_subtitler.cpp | 1 | ||||
| -rw-r--r-- | engines/wintermute/video/video_theora_player.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp index 6d65adea74..965f7f1979 100644 --- a/engines/wintermute/video/video_subtitler.cpp +++ b/engines/wintermute/video/video_subtitler.cpp @@ -177,6 +177,7 @@ bool CVidSubtitler::LoadSubtitles(const char *Filename, const char *SubtitleFile ////////////////////////////////////////////////////////////////////////// bool CVidSubtitler::Display() { + warning((const char *)m_Subtitles[m_CurrentSubtitle]->m_Text); #if 0 if (m_ShowSubtitle) { CBFont *font = Game->m_VideoFont ? Game->m_VideoFont : Game->m_SystemFont; diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp index 205ebe5035..232c4847b1 100644 --- a/engines/wintermute/video/video_theora_player.cpp +++ b/engines/wintermute/video/video_theora_player.cpp @@ -217,7 +217,8 @@ bool VideoTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGame, _state = THEORA_STATE_PLAYING; _looping = looping; _playbackType = type; - + _subtitler->Update(_theoraDecoder->getFrameCount()); + _subtitler->Display(); _startTime = startTime; _volume = volume; _posX = x; @@ -292,6 +293,9 @@ bool VideoTheoraPlayer::update() { } if (_theoraDecoder) { + + _subtitler->Update(_theoraDecoder->getCurFrame()); + if (_theoraDecoder->endOfVideo() && _looping) { warning("Should loop movie %s, hacked for now", _filename.c_str()); _theoraDecoder->rewind(); @@ -419,6 +423,7 @@ bool VideoTheoraPlayer::display(uint32 alpha) { /* if (m_Subtitler && _gameRef->m_VideoSubtitles) { m_Subtitler->display(); }*/ + _subtitler->Display(); return res; } |