Various joining fixes.

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 7dbf416041d8bf4bfa555bf45341ee01e04af812..f87b3397b4b68e388f3f5e0f37b512c385c4bcf5 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -56,11 +56,13 @@ public:
        ~Playlist ();
 
        void as_xml (xmlpp::Node *);
-       void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+       void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
 
        void add (boost::shared_ptr<Content>);
        void remove (boost::shared_ptr<Content>);
        void remove (ContentList);
+       void move_earlier (boost::shared_ptr<Content>);
+       void move_later (boost::shared_ptr<Content>);
 
        bool has_subtitles () const;
 
@@ -78,6 +80,8 @@ public:
 
        void repeat (ContentList, int);
 
+       bool content_paths_valid () const;
+
        mutable boost::signals2::signal<void ()> Changed;
        /** Third parameter is true if signals are currently being emitted frequently */
        mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
@@ -86,6 +90,7 @@ private:
        void content_changed (boost::weak_ptr<Content>, int, bool);
        void reconnect ();
 
+       /** List of content.  Kept sorted in position order. */
        ContentList _content;
        bool _sequence_video;
        bool _sequencing_video;