diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-25 13:29:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-25 13:29:13 +0100 |
| commit | 4ee6786d1c3db04dcc77e511121e5d62d0d595b5 (patch) | |
| tree | 95ac9aa9af77caccffac5b7fcf63cb1a672ca77a /src/lib/content_factory.cc | |
| parent | d22243e8cd54c1c5de6c670445395907007428ea (diff) | |
Add VideoMXFContent (part of #803).
Diffstat (limited to 'src/lib/content_factory.cc')
| -rw-r--r-- | src/lib/content_factory.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index e21a4c0d0..706c79754 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -29,6 +29,7 @@ #include "dcp_subtitle_content.h" #include "util.h" #include "ffmpeg_audio_stream.h" +#include "video_mxf_content.h" #include "film.h" #include "log_entry.h" #include "log.h" @@ -87,6 +88,8 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l content.reset (new DCPContent (film, node, version)); } else if (type == "DCPSubtitle") { content.reset (new DCPSubtitleContent (film, node, version)); + } else if (type == "VideoMXF") { + content.reset (new VideoMXFContent (film, node, version)); } return content; @@ -162,6 +165,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path) content.reset (new DCPSubtitleContent (film, path)); } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) { content.reset (new DCPSubtitleContent (film, path)); + } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) { + content.reset (new VideoMXFContent (film, path)); } if (!content) { |