Another try at sorting out the thorny question of timing.

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 8278490490fb5f9b515bf8cd9d391a24e2e4107f..2d243fe8f0e84060b0ffa20b93a96d08fbf7af31 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -17,13 +17,14 @@
 
 */
 
+#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"
 
 class Content;
 class FFmpegContent;
@@ -34,100 +35,70 @@ 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)
+ */
+
+struct ContentSorter
+{
+       bool operator() (boost::shared_ptr<Content> a, boost::shared_ptr<Content> b);
+};
 
 class Playlist
 {
 public:
        Playlist ();
+       Playlist (boost::shared_ptr<const Playlist>);
+       ~Playlist ();
 
-       void setup (std::list<boost::shared_ptr<Content> >);
+       void as_xml (xmlpp::Node *);
+       void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 
-       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
-       };
-
-       enum AudioFrom {
-               AUDIO_NONE,
-               AUDIO_FFMPEG,
-               AUDIO_SNDFILE
-       };
-
-       VideoFrom video_from () const {
-               return _video_from;
-       }
+       void add (boost::shared_ptr<Content>);
+       void remove (boost::shared_ptr<Content>);
 
-       AudioFrom audio_from () const {
-               return _audio_from;
-       }
+       bool has_subtitles () const;
 
-       boost::shared_ptr<const FFmpegContent> ffmpeg () const {
-               return _ffmpeg;
+       typedef std::vector<boost::shared_ptr<Content> > ContentList;
+       
+       ContentList content () const {
+               return _content;
        }
 
-       std::list<boost::shared_ptr<const ImageMagickContent> > imagemagick () const {
-               return _imagemagick;
-       }
+       std::string video_digest () const;
 
-       std::list<boost::shared_ptr<const SndfileContent> > sndfile () const {
-               return _sndfile;
+       int loop () const {
+               return _loop;
        }
        
-private:
-       VideoFrom _video_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;
-};
-
-class Player : public VideoSource, public AudioSource, public VideoSink, public AudioSink, public boost::enable_shared_from_this<Player>
-{
-public:
-       Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
-
-       void disable_video ();
-       void disable_audio ();
-       void disable_subtitles ();
-       void disable_video_sync ();
+       void set_loop (int l);
 
-       bool pass ();
-       void set_progress (boost::shared_ptr<Job>);
-       bool seek (double);
-       bool seek_to_last ();
+       Time length () const;
+       int best_dcp_frame_rate () const;
+       Time video_end () const;
 
-       double last_video_time () const;
+       void set_sequence_video (bool);
 
-private:
-       void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
-       void process_audio (boost::shared_ptr<AudioBuffers>);
-       void setup_decoders ();
-
-       boost::shared_ptr<const Film> _film;
-       boost::shared_ptr<const Playlist> _playlist;
-       
-       bool _video;
-       bool _audio;
-       bool _subtitles;
+       mutable boost::signals2::signal<void ()> Changed;
+       mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
        
-       bool _have_setup_decoders;
-       boost::shared_ptr<FFmpegDecoder> _ffmpeg_decoder;
-       bool _ffmpeg_decoder_done;
-       std::list<boost::shared_ptr<ImageMagickDecoder> > _imagemagick_decoders;
-       std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator _imagemagick_decoder;
-       std::list<boost::shared_ptr<SndfileDecoder> > _sndfile_decoders;
-
-       bool _video_sync;
+private:
+       void content_changed (boost::weak_ptr<Content>, int);
+       void reconnect ();
+
+       ContentList _content;
+       int _loop;
+       bool _sequence_video;
+       bool _sequencing_video;
+       std::list<boost::signals2::connection> _content_connections;
 };
+
+#endif