More noncopyable.

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index aff6017fad640101241bf0e3ed8ba9e9fbfe1f7d..5346dd5e7488591d7aabbfb7f722e0946e71c8dd 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,11 +47,15 @@ class Region;
  * are played simultaneously (i.e. they can be split up into multiple files for different channels)
  */
 
-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 *);
@@ -74,8 +72,7 @@ public:
                return _content;
        }
 
-       std::string audio_digest () const;
-       std::string video_digest () const;
+       std::string video_identifier () const;
 
        int loop () const {
                return _loop;
@@ -85,16 +82,23 @@ public:
 
        Time length () const;
        int best_dcp_frame_rate () const;
+       Time video_end () const;
+
+       void set_sequence_video (bool);
+       void maybe_sequence_video ();
 
        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 ();
 
        ContentList _content;
        int _loop;
+       bool _sequence_video;
+       bool _sequencing_video;
        std::list<boost::signals2::connection> _content_connections;
 };