Merge 1.70.0-hotfix branch into master.

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

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index e800628c161dec79fdb68dc5a4fb8645353ff930..98b1dd859536643c83c524e3a22a4df45b039c8a 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -24,21 +24,22 @@
 #include "util.h"
 
 using std::string;
+using std::list;
 using boost::shared_ptr;
 
 shared_ptr<Content>
-content_factory (shared_ptr<const Film> film, cxml::NodePtr node)
+content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, list<string>& notes)
 {
        string const type = node->string_child ("Type");
 
        boost::shared_ptr<Content> content;
        
        if (type == "FFmpeg") {
-               content.reset (new FFmpegContent (film, node));
+               content.reset (new FFmpegContent (film, node, version, notes));
        } else if (type == "Image") {
-               content.reset (new ImageContent (film, node));
+               content.reset (new ImageContent (film, node, version));
        } else if (type == "Sndfile") {
-               content.reset (new SndfileContent (film, node));
+               content.reset (new SndfileContent (film, node, version));
        }
 
        return content;