X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=91051e9c4752353f6fe79a4793b69850dc6f81a3;hb=fc7c87692f090b9233210335dfb7c4f53e0f58be;hp=1d69c34baee71bde82ee950cf9f5854e88f0fbf9;hpb=3d9fdcf7e6a5d775a2688a071b69264b1a6971c7;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 1d69c34ba..91051e9c4 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -20,35 +20,34 @@
 #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 <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
 
 class Content;
 class FFmpegContent;
 class FFmpegDecoder;
-class ImageMagickContent;
-class ImageMagickDecoder;
+class StillImageMagickContent;
+class StillImageMagickDecoder;
 class SndfileContent;
 class SndfileDecoder;
 class Job;
 class Film;
 class Region;
 
-/** @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.
- */
-
 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,37 +55,42 @@ public:
 	~Playlist ();
 
 	void as_xml (xmlpp::Node *);
-	void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+	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>);
-
-	bool has_subtitles () const;
-
-	typedef std::vector<boost::shared_ptr<Content> > ContentList;
+	void remove (ContentList);
+	void move_earlier (boost::shared_ptr<Content>);
+	void move_later (boost::shared_ptr<Content>);
 
 	ContentList content () const;
 
 	std::string video_identifier () const;
 
-	Time length () const;
+	DCPTime length () 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 (std::list<boost::shared_ptr<Content> >, int);
+	void repeat (ContentList, int);
 
+	/** 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 ();
 
+	/** List of content.  Kept sorted in position order. */
 	ContentList _content;
 	bool _sequence_video;
 	bool _sequencing_video;