X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=dc984aacf077d64f78ea37520d9162cbfdbad9f8;hp=0a5c087dea67ed076f0833e584ef2c5b3359a823;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=3412af70b950dcdc604413ef05c26becda6da789

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 0a5c087de..dc984aacf 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,6 +23,7 @@
 
 #include "util.h"
 #include "frame_rate_change.h"
+#include "atomicity_checker.h"
 #include <libcxml/cxml.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
@@ -46,51 +47,54 @@ public:
 	~Playlist ();
 
 	void as_xml (xmlpp::Node *, bool with_content_paths);
-	void set_from_xml (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int, std::list<std::string> &);
+	void set_from_xml (boost::shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, std::list<std::string>& notes);
 
-	void add (boost::shared_ptr<Content>);
+	void add (boost::shared_ptr<const Film> film, boost::shared_ptr<Content>);
 	void remove (boost::shared_ptr<Content>);
 	void remove (ContentList);
-	void move_earlier (boost::shared_ptr<Content>);
-	void move_later (boost::shared_ptr<Content>);
+	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>);
 
 	ContentList content () const;
 
 	std::string video_identifier () const;
 
-	DCPTime length () const;
-	boost::optional<DCPTime> start () const;
-	int64_t required_disk_space (int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
+	dcpomatic::DCPTime length (boost::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;
 
 	int best_video_frame_rate () const;
-	DCPTime video_end () const;
-	DCPTime subtitle_end () const;
-	FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
-	std::string content_summary (DCPTimePeriod period) const;
+	dcpomatic::DCPTime video_end (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime text_end (boost::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::pair<double, double> speed_up_range (int dcp_video_frame_rate) const;
 
 	void set_sequence (bool);
-	void maybe_sequence ();
+	void maybe_sequence (boost::shared_ptr<const Film> film);
 
-	void repeat (ContentList, int);
+	void repeat (boost::shared_ptr<const Film> film, ContentList, int);
 
 	/** Emitted when content has been added to or removed from the playlist; implies OrderChanged */
-	mutable boost::signals2::signal<void ()> Changed;
-	mutable boost::signals2::signal<void ()> OrderChanged;
-	/** Emitted when something about a piece of our content has changed;
-	 *  these emissions include when the position of the content changes.
-	 *  Third parameter is true if signals are currently being emitted frequently.
-	 */
-	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
+	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 */
+	mutable boost::signals2::signal<void ()> LengthChange;
+
+	mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
 private:
-	void content_changed (boost::weak_ptr<Content>, int, bool);
-	void reconnect ();
+	void content_change (boost::weak_ptr<const Film>, ChangeType, boost::weak_ptr<Content>, int, bool);
+	void disconnect ();
+	void reconnect (boost::shared_ptr<const Film> film);
 
+	mutable boost::mutex _mutex;
 	/** List of content.  Kept sorted in position order. */
 	ContentList _content;
 	bool _sequence;
 	bool _sequencing;
 	std::list<boost::signals2::connection> _content_connections;
+	AtomicityChecker _checker;
 };
 
 #endif