Merge master; fix crash on new film.

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 1a24a02277bc1bd3bb3caf5dff55e3f3e54110e4..85bde64ff7e741b10f8c1bc5b3d1d64c3c898a8e 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -25,6 +25,7 @@
 #include "video_sink.h"
 #include "audio_sink.h"
 #include "ffmpeg_content.h"
+#include "audio_mapping.h"
 
 class Content;
 class FFmpegContent;
@@ -36,6 +37,16 @@ class SndfileDecoder;
 class Job;
 class Film;
 
+/** @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 Playlist
 {
 public:
@@ -46,57 +57,50 @@ public:
        ContentAudioFrame audio_length () const;
        int audio_channels () const;
        int audio_frame_rate () const;
-       int64_t audio_channel_layout () const;
        bool has_audio () const;
        
        float video_frame_rate () const;
        libdcp::Size video_size () const;
        ContentVideoFrame video_length () const;
 
-       enum VideoFrom {
-               VIDEO_NONE,
-               VIDEO_FFMPEG,
-               VIDEO_IMAGEMAGICK
-       };
+       AudioMapping default_audio_mapping () const;
+       ContentVideoFrame content_length () const;
 
        enum AudioFrom {
-               AUDIO_NONE,
                AUDIO_FFMPEG,
                AUDIO_SNDFILE
        };
 
-       VideoFrom video_from () const {
-               return _video_from;
-       }
-
        AudioFrom audio_from () const {
                return _audio_from;
        }
 
-       boost::shared_ptr<const FFmpegContent> ffmpeg () const {
-               return _ffmpeg;
+       std::list<boost::shared_ptr<const VideoContent> > video () const {
+               return _video;
        }
 
-       std::list<boost::shared_ptr<const ImageMagickContent> > imagemagick () const {
-               return _imagemagick;
+       std::list<boost::shared_ptr<const AudioContent> > audio () const {
+               return _audio;
        }
 
-       std::list<boost::shared_ptr<const SndfileContent> > sndfile () const {
-               return _sndfile;
-       }
+       std::string audio_digest () const;
+       std::string video_digest () const;
 
        mutable boost::signals2::signal<void ()> Changed;
        mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
        
 private:
        void content_changed (boost::weak_ptr<Content>, int);
-       
-       VideoFrom _video_from;
+
+       /** where we should get our audio from */
        AudioFrom _audio_from;
 
-       boost::shared_ptr<const FFmpegContent> _ffmpeg;
-       std::list<boost::shared_ptr<const ImageMagickContent> > _imagemagick;
-       std::list<boost::shared_ptr<const SndfileContent> > _sndfile;
+       /** 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;
 
        std::list<boost::signals2::connection> _content_connections;
 };