From bb949ec65adf95f4a2c7dd5ee7e97b9daaaf3d3f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 16 Feb 2021 10:40:12 +0100 Subject: C++11 tidying. --- src/lib/playlist.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/lib/playlist.h') diff --git a/src/lib/playlist.h b/src/lib/playlist.h index 91f39bf6b..0dd2370a8 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2020 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,9 +18,11 @@ */ + #ifndef DCPOMATIC_PLAYLIST_H #define DCPOMATIC_PLAYLIST_H + #include "change_signaller.h" #include "frame_rate_change.h" #include "util.h" @@ -29,23 +31,29 @@ #include #include + class Film; + struct ContentSorter { bool operator() (std::shared_ptr a, std::shared_ptr 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 film, cxml::ConstNodePtr node, int version, std::list& notes); @@ -91,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 _content_connections; }; + #endif -- cgit v1.2.3