X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=3af17bb6c4794cf3114016eedfba312dcab5576b;hb=6cd300ca8513b360990360d2999bec3b8988fd97;hp=3e5093aca2494071e5564516dee59a5522e8d07b;hpb=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 3e5093aca..3af17bb6c 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -20,24 +20,14 @@
 #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,7 +58,9 @@ public:
 	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;
+
 	int best_dcp_frame_rate () const;
 	DCPTime video_end () const;
 	FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
@@ -78,10 +70,15 @@ 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;
-	/** Third parameter is true if signals are currently being emitted frequently */
+	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 ();