X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=76055bea0341c6ac2c831a11c0cf417de91fce5a;hb=3b932abd0c7634483911e1d5361e12b2d094ae6f;hp=3a7ca73bf3dcf4f3e772c024ab41c8c92439e5b6;hpb=883d885dc8690519d205c8baa275385af8a39f4b;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 3a7ca73bf..76055bea0 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -20,87 +20,69 @@
 #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 "video_source.h"
-#include "audio_source.h"
-#include "video_sink.h"
-#include "audio_sink.h"
-#include "ffmpeg_content.h"
-#include "audio_mapping.h"
-
-class Content;
-class FFmpegContent;
-class FFmpegDecoder;
-class ImageMagickContent;
-class ImageMagickDecoder;
-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.  At the moment
- * the ordering is implicit; video content is placed sequentially, and audio content is taken
- * from the video unless any sound-only files are present.  If sound-only files exist, they
- * are played simultaneously (i.e. they can be split up into multiple files for different channels)
- */
+class Film;
 
 struct ContentSorter
 {
 	bool operator() (boost::shared_ptr<Content> a, boost::shared_ptr<Content> b);
 };
 
-class Playlist
+/** @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:
 	Playlist ();
-	Playlist (boost::shared_ptr<const Playlist>);
 	~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>);
+	void remove (ContentList);
+	void move_earlier (boost::shared_ptr<Content>);
+	void move_later (boost::shared_ptr<Content>);
 
-	bool has_subtitles () const;
+	ContentList content () const;
 
-	typedef std::vector<boost::shared_ptr<Content> > ContentList;
-	
-	ContentList content () const {
-		return _content;
-	}
+	std::string video_identifier () const;
 
-	std::string audio_digest () const;
-	std::string video_digest () const;
+	DCPTime length () const;
+	boost::optional<DCPTime> start () const;
 
-	int loop () const {
-		return _loop;
-	}
-	
-	void set_loop (int l);
-
-	Time 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 (ContentList, int);
 
+	/** Emitted when content has been added to or removed from the playlist */
 	mutable boost::signals2::signal<void ()> Changed;
-	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
-	
+	/** 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);
+	void content_changed (boost::weak_ptr<Content>, int, bool);
 	void reconnect ();
 
+	/** List of content.  Kept sorted in position order. */
 	ContentList _content;
-	int _loop;
 	bool _sequence_video;
 	bool _sequencing_video;
 	std::list<boost::signals2::connection> _content_connections;