diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-18 23:40:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:36:56 +0100 |
| commit | c1f98c84cdf3829b31929453b8a89fdcbdcd0c42 (patch) | |
| tree | 12ee5a9950fd333c7f298b5b6b82f2821788141f /src/lib/content_factory.cc | |
| parent | 65cc06076b46cbd27ccfcf7387894358e2c8ab1e (diff) | |
More renaming; text -> plain.
sed -i "s/TextTextContent/PlainText/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/text_text/plain_text/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript
mv src/lib/text_text_content.cc src/lib/plain_text_content.cc
mv src/lib/text_text_content.h src/lib/plain_text_content.h
mv src/lib/text_text_decoder.cc src/lib/plain_text_decoder.cc
mv src/lib/text_text_decoder.h src/lib/plain_text_decoder.h
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 14ca579e9..24ad95578 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_text_content.h" +#include "plain_text_content.h" #include "dcp_content.h" #include "dcp_text_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 TextTextContent (film, node, version)); + content.reset (new PlainText (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 TextTextContent (film, path)); + single.reset (new PlainText (film, path)); } else if (ext == ".xml") { cxml::Document doc; doc.read_file (path); |