Use dcp::file_to_string().

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index b49baa43056369687b51cb8b4f38d6ab5eb27068..921637bc3a6d8e6cfcfea9535aae3ae3fc963701 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,33 +18,42 @@
 
 */
 
+
 #ifndef DCPOMATIC_PLAYLIST_H
 #define DCPOMATIC_PLAYLIST_H
 
-#include "util.h"
+
+#include "change_signaller.h"
 #include "frame_rate_change.h"
+#include "util.h"
 #include <libcxml/cxml.h>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 #include <list>
 
+
 class Film;
 
+
 struct ContentSorter
 {
        bool operator() (std::shared_ptr<Content> a, std::shared_ptr<Content> b);
 };
 
+
 /** @class Playlist
  *  @brief A set of Content objects with knowledge of how they should be arranged into
  *  a DCP.
  */
-class Playlist : public boost::noncopyable
+class Playlist
 {
 public:
        Playlist ();
        ~Playlist ();
 
+       Playlist (Playlist const&) = delete;
+       Playlist& operator= (Playlist const&) = delete;
+
        void as_xml (xmlpp::Node *, bool with_content_paths);
        void set_from_xml (std::shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, std::list<std::string>& notes);
 
@@ -74,7 +83,7 @@ public:
 
        void repeat (std::shared_ptr<const Film> film, ContentList, int);
 
-       /** Emitted when content has been added to or removed from the playlist; implies OrderChanged */
+       /** Emitted when content has been added to or removed from the playlist; implies OrderChange */
        mutable boost::signals2::signal<void (ChangeType)> Change;
        mutable boost::signals2::signal<void ()> OrderChange;
        /** Emitted when the length might have changed; may sometimes be emitted when it has not */
@@ -90,9 +99,10 @@ private:
        mutable boost::mutex _mutex;
        /** List of content.  Kept sorted in position order. */
        ContentList _content;
-       bool _sequence;
-       bool _sequencing;
+       bool _sequence = true;
+       bool _sequencing = false;
        std::list<boost::signals2::connection> _content_connections;
 };
 
+
 #endif