X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=d55232dadb8898793417165ed3b955290a39db14;hb=bd12a72f78409e3f482be3d47b5efb57af4ad982;hp=335e26013b02f1ad3eb51e4fefafd659acdc9924;hpb=e11276a822289d7d7d91a4f431f386ad28ef16dd;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 335e26013..d55232dad 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -46,7 +46,7 @@ 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 remove (boost::shared_ptr<Content>);
@@ -55,7 +55,6 @@ public:
 	void move_later (boost::shared_ptr<Content>);
 
 	ContentList content () const;
-	bool video_content_at (DCPTime time) const;
 
 	std::string video_identifier () const;
 
@@ -65,9 +64,10 @@ public:
 
 	int best_video_frame_rate () const;
 	DCPTime video_end () const;
-	DCPTime subtitle_end () const;
+	DCPTime text_end () const;
 	FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
 	std::string content_summary (DCPTimePeriod period) const;
+	std::pair<double, double> speed_up_range (int dcp_video_frame_rate) const;
 
 	void set_sequence (bool);
 	void maybe_sequence ();
@@ -75,16 +75,13 @@ public:
 	void repeat (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 (ChangeType)> Change;
 	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, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
 private:
-	void content_changed (boost::weak_ptr<Content>, int, bool);
+	void content_change (ChangeType, boost::weak_ptr<Content>, int, bool);
 	void reconnect ();
 
 	/** List of content.  Kept sorted in position order. */