X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=50ae1401a948cf6851e586bf55dc95a6652badf3;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=9e3dbb6dfbf39ccf2f6f6864d1ee2920983ff447;hpb=1f82930e73679d6aec5223caa255f564339a1a2a;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 9e3dbb6df..50ae1401a 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,43 +1,34 @@
 /*
-    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/>.
 
 */
 
 #ifndef DCPOMATIC_PLAYLIST_H
 #define DCPOMATIC_PLAYLIST_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include "ffmpeg_content.h"
-#include "audio_mapping.h"
 #include "util.h"
 #include "frame_rate_change.h"
+#include <libcxml/cxml.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <list>
 
-class Content;
-class FFmpegContent;
-class FFmpegDecoder;
-class StillImageMagickContent;
-class StillImageMagickDecoder;
-class SndfileContent;
-class SndfileDecoder;
-class Job;
 class Film;
-class Region;
 
 struct ContentSorter
 {
@@ -68,32 +59,36 @@ public:
 	std::string video_identifier () const;
 
 	DCPTime length () const;
-	
-	int best_dcp_frame_rate () const;
+	boost::optional<DCPTime> start () const;
+	int64_t required_disk_space (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;
 
-	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 */
+	/** 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;
-	
+
 private:
 	void content_changed (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;
 };