diff options
Diffstat (limited to 'src/lib/content_factory.cc')
| -rw-r--r-- | src/lib/content_factory.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 51dc4e1b3..14ca579e9 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -26,9 +26,9 @@ #include "audio_content.h" #include "image_content.h" #include "atmos_mxf_content.h" -#include "text_subtitle_content.h" +#include "text_text_content.h" #include "dcp_content.h" -#include "dcp_subtitle_content.h" +#include "dcp_text_content.h" #include "util.h" #include "ffmpeg_audio_stream.h" #include "video_mxf_content.h" @@ -88,11 +88,11 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l ); } else if (type == "SubRip" || type == "TextSubtitle") { - content.reset (new TextSubtitleContent (film, node, version)); + content.reset (new TextTextContent (film, node, version)); } else if (type == "DCP") { content.reset (new DCPContent (film, node, version)); } else if (type == "DCPSubtitle") { - content.reset (new DCPSubtitleContent (film, node, version)); + content.reset (new DCPTextContent (film, node, version)); } else if (type == "VideoMXF") { content.reset (new VideoMXFContent (film, node, version)); } else if (type == "AtmosMXF") { @@ -210,16 +210,16 @@ 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 TextSubtitleContent (film, path)); + single.reset (new TextTextContent (film, path)); } else if (ext == ".xml") { cxml::Document doc; doc.read_file (path); if (doc.root_name() == "DCinemaSecurityMessage") { throw KDMAsContentError (); } - single.reset (new DCPSubtitleContent (film, path)); + single.reset (new DCPTextContent (film, path)); } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { - single.reset (new DCPSubtitleContent (film, path)); + single.reset (new DCPTextContent (film, path)); } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) { single.reset (new VideoMXFContent (film, path)); } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) { |