summaryrefslogtreecommitdiff
path: root/src/lib/playlist.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-02-16 10:40:12 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-16 10:40:12 +0100
commitbb949ec65adf95f4a2c7dd5ee7e97b9daaaf3d3f (patch)
tree09153b297f7cebd3f13ab58188982366185298f6 /src/lib/playlist.h
parent39d51cddeeea82e602ab1925430b0dfb5752ac79 (diff)
C++11 tidying.
Diffstat (limited to 'src/lib/playlist.h')
-rw-r--r--src/lib/playlist.h17
1 files changed, 13 insertions, 4 deletions
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 <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
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 <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);
@@ -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<boost::signals2::connection> _content_connections;
};
+
#endif