Merge master.

[dcpomatic.git] / src / lib / playlist.h

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index e4f4c79f00ee5c8fcaa46e0a7ad17ca014105e81..444eb9ae5ebb5ae1aac34932440025c92c3f8b43 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -23,18 +23,15 @@
 #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;
@@ -45,10 +42,7 @@ class Region;
  *  @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.
  */
 
 struct ContentSorter
@@ -56,50 +50,48 @@ struct ContentSorter
        bool operator() (boost::shared_ptr<Content> a, boost::shared_ptr<Content> b);
 };
 
-class Playlist
+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>, 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>);
 
        bool has_subtitles () const;
 
-       typedef std::vector<boost::shared_ptr<Content> > ContentList;
-       
-       ContentList content () const {
-               return _content;
-       }
+       ContentList content () const;
 
-       std::string video_digest () const;
+       std::string video_identifier () const;
 
-       int loop () const {
-               return _loop;
-       }
+       DCPTime length () const;
        
-       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);
 
        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 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;