Merge master.

[dcpomatic.git] / src / lib / content_factory.cc

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 789496d08e043c7d911ce2991eff4f689b3e4e68..16340adb43b0e74f8f14d4b2bc039e258d8e58a9 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -26,6 +26,8 @@
 #include "image_content.h"
 #include "sndfile_content.h"
 #include "subrip_content.h"
+#include "dcp_content.h"
+#include "dcp_subtitle_content.h"
 #include "util.h"
 
 using std::string;
@@ -54,6 +56,10 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
                content.reset (new SndfileContent (film, node, version));
        } else if (type == "SubRip") {
                content.reset (new SubRipContent (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));
        }
 
        return content;
@@ -78,6 +84,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                content.reset (new SndfileContent (film, path));
        } else if (ext == ".srt") {
                content.reset (new SubRipContent (film, path));
+       } else if (ext == ".xml") {
+               content.reset (new DCPSubtitleContent (film, path));
        } else {
                content.reset (new FFmpegContent (film, path));
        }