diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-25 16:55:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-25 16:55:42 +0100 |
| commit | 48e51965d74cf2a2f2f6f4c5e9c349f1b1103e66 (patch) | |
| tree | 544effa2cf914f1bcc5b98c05cd6c9473f10ed06 /src/lib/content_factory.cc | |
| parent | f79a483c937dad8a89410b5aed97c11d8a715443 (diff) | |
Basics of Atmos content support; can be added to project and appears in timeline.
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 706c79754..df803809f 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -24,6 +24,7 @@ #include "ffmpeg_content.h" #include "audio_content.h" #include "image_content.h" +#include "atmos_mxf_content.h" #include "text_subtitle_content.h" #include "dcp_content.h" #include "dcp_subtitle_content.h" @@ -90,6 +91,8 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l content.reset (new DCPSubtitleContent (film, node, version)); } else if (type == "VideoMXF") { content.reset (new VideoMXFContent (film, node, version)); + } else if (type == "AtmosMXF") { + content.reset (new AtmosMXFContent (film, node, version)); } return content; @@ -167,6 +170,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path) content.reset (new DCPSubtitleContent (film, path)); } else if (ext == ".mxf" && VideoMXFContent::valid_mxf (path)) { content.reset (new VideoMXFContent (film, path)); + } else if (ext == ".mxf" && AtmosMXFContent::valid_mxf (path)) { + content.reset (new AtmosMXFContent (film, path)); } if (!content) { |