X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=444eb9ae5ebb5ae1aac34932440025c92c3f8b43;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=e6acff6944472db7e45827237914f1279c1c1a93;hpb=9bf304a86a3df6f4b10a572d657b5d7beb910582;p=dcpomatic.git

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index e6acff694..444eb9ae5 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -17,116 +17,84 @@
 
 */
 
+#ifndef DCPOMATIC_PLAYLIST_H
+#define DCPOMATIC_PLAYLIST_H
+
 #include <list>
 #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"
+#include "util.h"
 
 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.  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)
+ * This class holds Content objects, and it knows how they should be arranged.
  */
-    
-class Playlist
+
+struct ContentSorter
+{
+	bool operator() (boost::shared_ptr<Content> a, boost::shared_ptr<Content> b);
+};
+
+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 cxml::Node>);
+	void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, 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>);
 
-	ContentAudioFrame audio_length () const;
-	int audio_channels () const;
-	int audio_frame_rate () const;
-	bool has_audio () const;
-	
-	float video_frame_rate () const;
-	libdcp::Size video_size () const;
-	ContentVideoFrame video_length () const;
-
-	AudioMapping default_audio_mapping () const;
-	ContentVideoFrame content_length () const;
-
-	enum AudioFrom {
-		AUDIO_FFMPEG,
-		AUDIO_SNDFILE
-	};
-
-	AudioFrom audio_from () const {
-		return _audio_from;
-	}
-
 	bool has_subtitles () const;
-	
-	ContentList content () const {
-		return _content;
-	}
 
-	boost::shared_ptr<FFmpegContent> ffmpeg () const;
+	ContentList content () const;
 
-	std::list<boost::shared_ptr<const VideoContent> > video () const {
-		return _video;
-	}
+	std::string video_identifier () const;
 
-	std::list<boost::shared_ptr<const AudioContent> > audio () const {
-		return _audio;
-	}
+	DCPTime length () const;
+	
+	int best_dcp_frame_rate () const;
+	DCPTime video_end () const;
+	FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
 
-	std::string audio_digest () const;
-	std::string video_digest () const;
+	void set_sequence_video (bool);
+	void maybe_sequence_video ();
 
-	int loop () const {
-		return _loop;
-	}
-	
-	void set_loop (int l);
+	void repeat (ContentList, int);
 
 	mutable boost::signals2::signal<void ()> Changed;
-	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
+	/** 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 setup ();
-	void content_changed (boost::weak_ptr<Content>, int);
+	void content_changed (boost::weak_ptr<Content>, int, bool);
+	void reconnect ();
 
-	/** where we should get our audio from */
-	AudioFrom _audio_from;
-
-	/** all our content */
+	/** List of content.  Kept sorted in position order. */
 	ContentList _content;
-	/** all our content which contains video */
-	std::list<boost::shared_ptr<const VideoContent> > _video;
-	/** all our content which contains audio.  This may contain the same objects
-	 *  as _video for FFmpegContent.
-	 */
-	std::list<boost::shared_ptr<const AudioContent> > _audio;
-
-	int _loop;
-
+	bool _sequence_video;
+	bool _sequencing_video;
 	std::list<boost::signals2::connection> _content_connections;
 };
+
+#endif