diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-23 11:20:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-23 11:20:12 +0100 |
| commit | df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc (patch) | |
| tree | 04e6f5917ed3c2e8ea45904ff0235c08d29a6446 /src/tools | |
| parent | 6f146336b73fe720c83cb75ebdf15e9cb9c02973 (diff) | |
More automated renaming.
ActiveCaptions -> ActiveText
BitmapCaption -> BitmapText
ContentCaption -> ContentText
ContentTextCaption -> ContentStringText
TextCaptionFileContent -> StringTextFileContent
TextCaptionFileDecoder -> StringTextFileDecoder
TextCaptionFile -> StringTextFile
TextCaption -> StringText
PlayerCaption -> PlayerText
CaptionContent -> TextContent
CaptionDecoder -> TextDecoder
CaptionPanel -> TextPanel
CaptionView -> TextView
CaptionAppearanceDialog -> SubtitleAppearanceDialog
CaptionType -> TextType
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 6 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index b6aa2188a..a2b55691e 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -71,7 +71,7 @@ #include "lib/transcode_job.h" #include "lib/dkdm_wrapper.h" #include "lib/audio_content.h" -#include "lib/caption_content.h" +#include "lib/text_content.h" #include <dcp/exceptions.h> #include <dcp/raw_convert.h> #include <wx/generic/aboutdlgg.h> @@ -580,8 +580,8 @@ private: } if (d->caption()) { - list<shared_ptr<CaptionContent> >::iterator j = i->caption.begin (); - list<shared_ptr<CaptionContent> >::const_iterator k = _clipboard->caption.begin (); + list<shared_ptr<TextContent> >::iterator j = i->caption.begin (); + list<shared_ptr<TextContent> >::const_iterator k = _clipboard->caption.begin (); while (j != i->caption.end() && k != _clipboard->caption.end()) { (*j)->take_settings_from (*k); ++j; diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index e5745403d..44c6b8606 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -27,7 +27,7 @@ #include "lib/job_manager.h" #include "lib/job.h" #include "lib/video_content.h" -#include "lib/caption_content.h" +#include "lib/text_content.h" #include "lib/ratio.h" #include "lib/verify_dcp_job.h" #include "lib/dcp_examiner.h" @@ -626,7 +626,7 @@ private: void setup_from_dcp (shared_ptr<DCPContent> dcp) { - BOOST_FOREACH (shared_ptr<CaptionContent> i, dcp->caption) { + BOOST_FOREACH (shared_ptr<TextContent> i, dcp->caption) { i->set_use (true); } |