Revert "Remove join function; the code is long and I don't think anybody"

[dcpomatic.git] / src / lib / content.h

diff --git a/src/lib/content.h b/src/lib/content.h
index 2a249011a55f4d889383b8a76702d8daaf71893d..d84f636fb5c35465a5f2cb0057359eb204408cb6 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -67,6 +67,7 @@ public:
        Content (boost::shared_ptr<const Film>, DCPTime);
        Content (boost::shared_ptr<const Film>, boost::filesystem::path);
        Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+       Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
        virtual ~Content () {}
 
        /** Examine the content to establish digest, frame rates and any other