Merge master.

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 35709f109d2bf4bb4cbcbd725f61bbce7f7bf3ae..444eb9ae5ebb5ae1aac34932440025c92c3f8b43 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -57,7 +57,7 @@ public:
        ~Playlist ();
 
        void as_xml (xmlpp::Node *);
-       void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
+       void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int, std::list<std::string> &);
 
        void add (boost::shared_ptr<Content>);
        void remove (boost::shared_ptr<Content>);