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/content_factory.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/content_factory.cc')
| -rw-r--r-- | src/lib/content_factory.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 8c473b7bc..077ef529e 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -26,7 +26,7 @@ #include "audio_content.h" #include "image_content.h" #include "atmos_mxf_content.h" -#include "text_caption_file_content.h" +#include "string_text_file_content.h" #include "dcp_content.h" #include "dcp_subtitle_content.h" #include "util.h" @@ -88,7 +88,7 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l ); } else if (type == "SubRip" || type == "TextSubtitle") { - content.reset (new TextCaptionFileContent (film, node, version)); + content.reset (new StringTextFileContent (film, node, version)); } else if (type == "DCP") { content.reset (new DCPContent (film, node, version)); } else if (type == "DCPSubtitle") { @@ -210,7 +210,7 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path) if (valid_image_file (path)) { single.reset (new ImageContent (film, path)); } else if (ext == ".srt" || ext == ".ssa" || ext == ".ass") { - single.reset (new TextCaptionFileContent (film, path)); + single.reset (new StringTextFileContent (film, path)); } else if (ext == ".xml") { cxml::Document doc; doc.read_file (path); |