X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplaylist.h;h=76055bea0341c6ac2c831a11c0cf417de91fce5a;hb=a9936a35fbae63311b1132e6283bf28db1d8c233;hp=f87b3397b4b68e388f3f5e0f37b512c385c4bcf5;hpb=f0be0f0e060e40d9a0da1b44429ef41901b8a536;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index f87b3397b..76055bea0 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -20,35 +20,24 @@
 #ifndef DCPOMATIC_PLAYLIST_H
 #define DCPOMATIC_PLAYLIST_H
 
-#include <list>
+#include "util.h"
+#include "frame_rate_change.h"
+#include <libcxml/cxml.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include "ffmpeg_content.h"
-#include "audio_mapping.h"
-
-class Content;
-class FFmpegContent;
-class FFmpegDecoder;
-class StillImageMagickContent;
-class StillImageMagickDecoder;
-class SndfileContent;
-class SndfileDecoder;
-class Job;
-class Film;
-class Region;
+#include <boost/signals2.hpp>
+#include <list>
 
-/** @class Playlist
- *  @brief A set of content files (video and audio), with knowledge of how they should be arranged into
- *  a DCP.
- *
- * This class holds Content objects, and it knows how they should be arranged.
- */
+class Film;
 
 struct ContentSorter
 {
 	bool operator() (boost::shared_ptr<Content> a, boost::shared_ptr<Content> b);
 };
 
+/** @class Playlist
+ *  @brief A set of Content objects with knowledge of how they should be arranged into
+ *  a DCP.
+ */
 class Playlist : public boost::noncopyable
 {
 public:
@@ -56,7 +45,7 @@ public:
 	~Playlist ();
 
 	void as_xml (xmlpp::Node *);
-	void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
+	void set_from_xml (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int, std::list<std::string> &);
 
 	void add (boost::shared_ptr<Content>);
 	void remove (boost::shared_ptr<Content>);
@@ -64,28 +53,30 @@ public:
 	void move_earlier (boost::shared_ptr<Content>);
 	void move_later (boost::shared_ptr<Content>);
 
-	bool has_subtitles () const;
-
 	ContentList content () const;
 
 	std::string video_identifier () const;
 
-	Time length () const;
-	
+	DCPTime length () const;
+	boost::optional<DCPTime> start () const;
+
 	int best_dcp_frame_rate () const;
-	Time video_end () const;
+	DCPTime video_end () const;
+	FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
 
 	void set_sequence_video (bool);
 	void maybe_sequence_video ();
 
 	void repeat (ContentList, int);
 
-	bool content_paths_valid () const;
-
+	/** Emitted when content has been added to or removed from the playlist */
 	mutable boost::signals2::signal<void ()> Changed;
-	/** Third parameter is true if signals are currently being emitted frequently */
+	/** 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 ();