X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=a5dce1498be1d500c9861cb9e2dfc883693967ed;hp=d7db75d0fb9ed44feccfb7a70a0561780eea5eb6;hb=HEAD;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index d7db75d0f..e2662eb45 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,81 +18,87 @@
 
 */
 
+
 #ifndef DCPOMATIC_PLAYLIST_H
 #define DCPOMATIC_PLAYLIST_H
 
-#include "util.h"
+
+#include "change_signaller.h"
+#include "dcpomatic_time.h"
 #include "frame_rate_change.h"
-#include "atomicity_checker.h"
+#include "types.h"
 #include <libcxml/cxml.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
 #include <list>
 
+
 class Film;
 
-struct ContentSorter
-{
-	bool operator() (boost::shared_ptr<Content> a, boost::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() = default;
+
 	~Playlist ();
 
+	Playlist (Playlist const&) = delete;
+	Playlist& operator= (Playlist const&) = delete;
+
 	void as_xml (xmlpp::Node *, bool with_content_paths);
-	void set_from_xml (boost::shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, std::list<std::string>& notes);
+	void set_from_xml (std::shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, std::list<std::string>& notes);
 
-	void add (boost::shared_ptr<const Film> film, boost::shared_ptr<Content>);
-	void remove (boost::shared_ptr<Content>);
+	void add (std::shared_ptr<const Film> film, std::shared_ptr<Content>);
+	void remove (std::shared_ptr<Content>);
 	void remove (ContentList);
-	void move_earlier (boost::shared_ptr<const Film> film, boost::shared_ptr<Content>);
-	void move_later (boost::shared_ptr<const Film> film, boost::shared_ptr<Content>);
+	void move_earlier (std::shared_ptr<const Film> film, std::shared_ptr<Content>);
+	void move_later (std::shared_ptr<const Film> film, std::shared_ptr<Content>);
 
 	ContentList content () const;
 
 	std::string video_identifier () const;
 
-	dcpomatic::DCPTime length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime length (std::shared_ptr<const Film> film) const;
 	boost::optional<dcpomatic::DCPTime> start () const;
-	int64_t required_disk_space (boost::shared_ptr<const Film> film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
+	int64_t required_disk_space (std::shared_ptr<const Film> film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
 
 	int best_video_frame_rate () const;
-	dcpomatic::DCPTime video_end (boost::shared_ptr<const Film> film) const;
-	dcpomatic::DCPTime text_end (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime video_end (std::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime text_end (std::shared_ptr<const Film> film) const;
 	FrameRateChange active_frame_rate_change (dcpomatic::DCPTime, int dcp_frame_rate) const;
-	std::string content_summary (boost::shared_ptr<const Film> film, dcpomatic::DCPTimePeriod period) const;
+	std::string content_summary (std::shared_ptr<const Film> film, dcpomatic::DCPTimePeriod period) const;
 	std::pair<double, double> speed_up_range (int dcp_video_frame_rate) const;
 
 	void set_sequence (bool);
-	void maybe_sequence (boost::shared_ptr<const Film> film);
+	void maybe_sequence (std::shared_ptr<const Film> film);
 
-	void repeat (boost::shared_ptr<const Film> film, ContentList, int);
+	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 ()> OrderChanged;
+	mutable boost::signals2::signal<void ()> OrderChange;
+	/** Emitted when the length might have changed; may sometimes be emitted when it has not */
+	mutable boost::signals2::signal<void ()> LengthChange;
 
-	mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
+	mutable boost::signals2::signal<void (ChangeType, std::weak_ptr<Content>, int, bool)> ContentChange;
 
 private:
-	void content_change (boost::weak_ptr<const Film>, ChangeType, boost::weak_ptr<Content>, int, bool);
+	void content_change (std::weak_ptr<const Film>, ChangeType, std::weak_ptr<Content>, int, bool);
 	void disconnect ();
-	void reconnect (boost::shared_ptr<const Film> film);
+	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;
-	bool _sequencing;
+	bool _sequence = true;
+	bool _sequencing = false;
 	std::list<boost::signals2::connection> _content_connections;
-	AtomicityChecker _checker;
 };
 
+
 #endif