X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=f8f51ac2da826e2857faeb2746a945378f4bda21;hb=7686d48aab59eeca84b32c74606453628977d903;hp=0ad70b52421ece5984664373b62e0ccc52428cbd;hpb=e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 0ad70b524..f8f51ac2d 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,19 +1,20 @@
 /*
     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>);
@@ -54,6 +55,9 @@ public:
 	void move_later (boost::shared_ptr<Content>);
 
 	ContentList content () const;
+	bool video_content_at (DCPTime time) const;
+	bool audio_content_at (DCPTime time) const;
+	boost::shared_ptr<Content> next_audio_content (DCPTime time) const;
 
 	std::string video_identifier () const;
 
@@ -61,10 +65,12 @@ 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 subtitle_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 ();