X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=d55232dadb8898793417165ed3b955290a39db14;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hp=0baf667fc119a6b78d295c7ae3649917ea046337;hpb=7ab80b672a5e7d0ec8ad5dccda7503c04d40ffb5;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 0baf667fc..d55232dad 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -44,8 +45,8 @@ public:
 	Playlist ();
 	~Playlist ();
 
-	void as_xml (xmlpp::Node *);
-	void set_from_xml (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int, std::list<std::string> &);
+	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 add (boost::shared_ptr<Content>);
 	void remove (boost::shared_ptr<Content>);
@@ -61,31 +62,32 @@ public:
 	boost::optional<DCPTime> start () const;
 	int64_t required_disk_space (int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
 
-	int best_dcp_frame_rate () const;
+	int best_video_frame_rate () const;
 	DCPTime video_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_video (bool);
-	void maybe_sequence_video ();
+	void set_sequence (bool);
+	void maybe_sequence ();
 
 	void repeat (ContentList, int);
 
-	/** Emitted when content has been added to or removed from the playlist */
-	mutable boost::signals2::signal<void ()> Changed;
-	/** 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;
+	/** Emitted when content has been added to or removed from the playlist; implies OrderChanged */
+	mutable boost::signals2::signal<void (ChangeType)> Change;
+	mutable boost::signals2::signal<void ()> OrderChanged;
+
+	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. */
 	ContentList _content;
-	bool _sequence_video;
-	bool _sequencing_video;
+	bool _sequence;
+	bool _sequencing;
 	std::list<boost::signals2::connection> _content_connections;
 };