diff options
author | Tobia Tesan | 2014-10-15 21:16:04 +0200 |
---|---|---|
committer | Tobia Tesan | 2014-10-15 21:36:46 +0200 |
commit | 388fbdb6eb8df910c2fff2dc34954f34759c5b16 (patch) | |
tree | 47ec8bee43b1f6b426c5c064ff7bf2f3d8462e58 /engines | |
parent | dd820a7a1e9adcb7c46d2cb2fe178c895e40b8c3 (diff) | |
download | scummvm-rg350-388fbdb6eb8df910c2fff2dc34954f34759c5b16.tar.gz scummvm-rg350-388fbdb6eb8df910c2fff2dc34954f34759c5b16.tar.bz2 scummvm-rg350-388fbdb6eb8df910c2fff2dc34954f34759c5b16.zip |
WINTERMUTE: Rename VideoSubtitle to SubtitleCard
Diffstat (limited to 'engines')
-rw-r--r-- | engines/wintermute/module.mk | 2 | ||||
-rw-r--r-- | engines/wintermute/video/subtitle_card.cpp (renamed from engines/wintermute/video/video_subtitle.cpp) | 12 | ||||
-rw-r--r-- | engines/wintermute/video/subtitle_card.h (renamed from engines/wintermute/video/video_subtitle.h) | 10 | ||||
-rw-r--r-- | engines/wintermute/video/video_subtitler.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/video/video_subtitler.h | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk index b4845b0552..4c95314a02 100644 --- a/engines/wintermute/module.mk +++ b/engines/wintermute/module.mk @@ -108,8 +108,8 @@ MODULE_OBJS := \ utils/path_util.o \ utils/string_util.o \ utils/utils.o \ + video/subtitle_card.o \ video/video_player.o \ - video/video_subtitle.o \ video/video_subtitler.o \ video/video_theora_player.o \ debugger.o \ diff --git a/engines/wintermute/video/video_subtitle.cpp b/engines/wintermute/video/subtitle_card.cpp index b02a3ec50f..971b2c019c 100644 --- a/engines/wintermute/video/video_subtitle.cpp +++ b/engines/wintermute/video/subtitle_card.cpp @@ -26,15 +26,15 @@ * Copyright (c) 2011 Jan Nedoma */ -#include "engines/wintermute/video/video_subtitle.h" +#include "engines/wintermute/video/subtitle_card.h" #include "engines/wintermute/base/base_game.h" namespace Wintermute { -VideoSubtitle::VideoSubtitle(BaseGame *inGame): BaseClass(inGame) { +SubtitleCard::SubtitleCard(BaseGame *inGame): BaseClass(inGame) { _startFrame = _endFrame = 0; } -VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame): BaseClass(inGame) { +SubtitleCard::SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame): BaseClass(inGame) { // TODO: Fix expandStringByStringTable instead of this ugly hack char *tmp = new char[text.size()]; strcpy(tmp, text.c_str()); @@ -44,15 +44,15 @@ VideoSubtitle::VideoSubtitle(BaseGame *inGame, const Common::String &text, const _endFrame = endFrame; } -uint32 VideoSubtitle::getStartFrame() { +uint32 SubtitleCard::getStartFrame() { return _startFrame; } -uint32 VideoSubtitle::getEndFrame() { +uint32 SubtitleCard::getEndFrame() { return _endFrame; } -Common::String VideoSubtitle::getText() { +Common::String SubtitleCard::getText() { return _text; } diff --git a/engines/wintermute/video/video_subtitle.h b/engines/wintermute/video/subtitle_card.h index fb80a58a72..5390d64fcb 100644 --- a/engines/wintermute/video/video_subtitle.h +++ b/engines/wintermute/video/subtitle_card.h @@ -26,17 +26,17 @@ * Copyright (c) 2011 Jan Nedoma */ -#ifndef WINTERMUTE_VIDSUBTITLE_H -#define WINTERMUTE_VIDSUBTITLE_H +#ifndef WINTERMUTE_SUBTITLECARD_H +#define WINTERMUTE_SUBTITLECARD_H #include "engines/wintermute/base/base.h" namespace Wintermute { -class VideoSubtitle : public BaseClass { +class SubtitleCard : public BaseClass { public: - VideoSubtitle(BaseGame *inGame); - VideoSubtitle(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame); + SubtitleCard(BaseGame *inGame); + SubtitleCard(BaseGame *inGame, const Common::String &text, const uint &startFrame, const uint &endFrame); uint32 getEndFrame(); uint32 getStartFrame(); Common::String getText(); diff --git a/engines/wintermute/video/video_subtitler.cpp b/engines/wintermute/video/video_subtitler.cpp index c8acbeb98b..c57a70ec3b 100644 --- a/engines/wintermute/video/video_subtitler.cpp +++ b/engines/wintermute/video/video_subtitler.cpp @@ -166,7 +166,7 @@ bool VideoSubtitler::loadSubtitles(const Common::String &filename, const Common: } if (start != -1 && text.size() > 0 && (start != 1 || end != 1)) { - _subtitles.push_back(new VideoSubtitle(_gameRef, text, start, end)); + _subtitles.push_back(new SubtitleCard(_gameRef, text, start, end)); } pos += lineLength + 1; diff --git a/engines/wintermute/video/video_subtitler.h b/engines/wintermute/video/video_subtitler.h index 655b1a5969..32e4368daf 100644 --- a/engines/wintermute/video/video_subtitler.h +++ b/engines/wintermute/video/video_subtitler.h @@ -30,7 +30,7 @@ #define WINTERMUTE_VIDSUBTITLER_H #include "engines/wintermute/base/base.h" -#include "engines/wintermute/video/video_subtitle.h" +#include "engines/wintermute/video/subtitle_card.h" namespace Wintermute { @@ -46,7 +46,7 @@ public: void display(); void update(uint32 frame); private: - Common::Array<VideoSubtitle *> _subtitles; + Common::Array<SubtitleCard *> _subtitles; uint32 _lastSample; }; |