Some missing copy constructors / operator= / noncopyable.

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

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 3a7ca73bf3dcf4f3e772c024ab41c8c92439e5b6..0b928fe51e46b27378a3aab87284a0221cae920f 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -23,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"
 
@@ -77,8 +73,7 @@ public:
                return _content;
        }
 
-       std::string audio_digest () const;
-       std::string video_digest () const;
+       std::string video_identifier () const;
 
        int loop () const {
                return _loop;
@@ -91,12 +86,14 @@ public:
        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;