X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcontent_factory.cc;h=167b3f4e929cbceffe29507ebaed609d0d5af5e7;hb=507a389e9c5f84ec1d51e7566e38fbf42f658537;hp=24ad9557807416624eb0e083663ad1691fd2ab46;hpb=c1f98c84cdf3829b31929453b8a89fdcbdcd0c42;p=dcpomatic.git diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 24ad95578..167b3f4e9 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 "plain_text_content.h" +#include "plain_text_file_content.h" #include "dcp_content.h" #include "dcp_text_content.h" #include "util.h" @@ -88,7 +88,7 @@ content_factory (shared_ptr film, cxml::NodePtr node, int version, l ); } else if (type == "SubRip" || type == "TextSubtitle") { - content.reset (new PlainText (film, node, version)); + content.reset (new PlainTextFileContent (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 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 PlainText (film, path)); + single.reset (new PlainTextFileContent (film, path)); } else if (ext == ".xml") { cxml::Document doc; doc.read_file (path);