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 e8cac0247d46877ea5e73bfa5771eafa2699d574..2d243fe8f0e84060b0ffa20b93a96d08fbf7af31 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -25,10 +23,6 @@
 #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"
 
@@ -53,6 +47,11 @@ class Region;
  * 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:
@@ -61,7 +60,7 @@ public:
        ~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>);
 
        void add (boost::shared_ptr<Content>);
        void remove (boost::shared_ptr<Content>);
@@ -74,7 +73,6 @@ public:
                return _content;
        }
 
-       std::string audio_digest () const;
        std::string video_digest () const;
 
        int loop () const {
@@ -83,8 +81,11 @@ public:
        
        void set_loop (int l);
 
-       Time length (boost::shared_ptr<const Film>) const;
+       Time length () const;
        int best_dcp_frame_rate () const;
+       Time video_end () const;
+
+       void set_sequence_video (bool);
 
        mutable boost::signals2::signal<void ()> Changed;
        mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
@@ -95,6 +96,8 @@ private:
 
        ContentList _content;
        int _loop;
+       bool _sequence_video;
+       bool _sequencing_video;
        std::list<boost::signals2::connection> _content_connections;
 };