X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.cc;h=3c65b43129a14a23d62628a8f14a1911495b4ec8;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=f4d9fe4e93f7734679a7e9145af58a227f8fb37b;hpb=e8fcbfaa9b5844400a2c64b5cdaa07442cca968d;p=dcpomatic.git diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index f4d9fe4e9..3c65b4312 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -29,7 +29,7 @@ #include "dcp_subtitle_content.h" #include "util.h" #include -#include +#include using std::string; using std::list; @@ -48,7 +48,7 @@ content_factory (shared_ptr film, cxml::NodePtr node, int version, l string const type = node->string_child ("Type"); boost::shared_ptr content; - + if (type == "FFmpeg") { content.reset (new FFmpegContent (film, node, version, notes)); } else if (type == "Image") { @@ -87,7 +87,7 @@ content_factory (shared_ptr film, boost::filesystem::path path) content.reset (new SubRipContent (film, path)); } else if (ext == ".xml") { content.reset (new DCPSubtitleContent (film, path)); - } else if (ext == ".mxf" && dcp::SMPTESubtitleContent::valid_mxf (path)) { + } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { content.reset (new DCPSubtitleContent (film, path)); }