projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index 89f36f89567572febf2cdaaf2fea8d08df25dca2..e2662eb4581d78293f7d344c6e35619eaae9c400 100644
(file)
--- a/
src/lib/playlist.h
+++ b/
src/lib/playlist.h
@@
-36,12
+36,6
@@
class Film;
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
* @brief A set of Content objects with knowledge of how they should be arranged into
* a DCP.
@@
-49,7
+43,8
@@
struct ContentSorter
class Playlist
{
public:
class Playlist
{
public:
- Playlist ();
+ Playlist() = default;
+
~Playlist ();
Playlist (Playlist const&) = delete;
~Playlist ();
Playlist (Playlist const&) = delete;
@@
-98,7
+93,7
@@
private:
void reconnect (std::shared_ptr<const Film> film);
mutable boost::mutex _mutex;
void reconnect (std::shared_ptr<const Film> film);
mutable boost::mutex _mutex;
- /** List of content
. Kept sorted in position order.
*/
+ /** List of content
, kept sorted by ContentSorter()
*/
ContentList _content;
bool _sequence = true;
bool _sequencing = false;
ContentList _content;
bool _sequence = true;
bool _sequencing = false;