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/lib/dcp_subtitle_content.cc | |
| 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/lib/dcp_subtitle_content.cc')
| -rw-r--r-- | src/lib/dcp_subtitle_content.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 779361f63..6a7e38153 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -21,7 +21,7 @@ #include "font.h" #include "dcp_subtitle_content.h" #include "film.h" -#include "caption_content.h" +#include "text_content.h" #include <dcp/raw_convert.h> #include <dcp/interop_subtitle_asset.h> #include <dcp/smpte_subtitle_asset.h> @@ -40,14 +40,14 @@ using dcp::raw_convert; DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path) : Content (film, path) { - caption.push_back (shared_ptr<CaptionContent> (new CaptionContent (this, CAPTION_OPEN))); + caption.push_back (shared_ptr<TextContent> (new TextContent (this, CAPTION_OPEN))); } DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) : Content (film, node) , _length (node->number_child<ContentTime::Type> ("Length")) { - caption = CaptionContent::from_xml (this, node, version); + caption = TextContent::from_xml (this, node, version); } void |