Check content for changes on loading a project.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index c6e657d162cf0558b7191bd2a3a5d728d5fe25d9..e17456cf2d87838861404484822c523e2f47612b 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -56,9 +56,6 @@ public:
        static int const FILM_CONTAINER;
        static int const FILM_VIDEO_FRAME_RATE;
        static int const DCP_DECODE_REDUCTION;
-       static int const IGNORE_COMPONENTS;
-       static int const FAST;
-       static int const PLAY_REFERENCED;
 };
 
 /** @class Player
@@ -89,16 +86,12 @@ public:
        void set_play_referenced ();
        void set_dcp_decode_reduction (boost::optional<int> reduction);
 
-       DCPTime content_time_to_dcp (boost::shared_ptr<Content> content, ContentTime t);
+       boost::optional<DCPTime> content_time_to_dcp (boost::shared_ptr<Content> content, ContentTime t);
 
-       /** Emitted when something has changed such that if we went back and emitted
-        *  the last frame again it would look different.  This is not emitted after
-        *  a seek.
-        *
-        *  The first parameter is what changed.
-        *  The second parameter is true if these signals are currently likely to be frequent.
-        */
-       boost::signals2::signal<void (int, bool)> Changed;
+       boost::signals2::signal<void (ChangeType, int, bool)> Change;
+
+       /** The change suggested by a MayChange did not happen */
+       boost::signals2::signal<void ()> NotChanged;
 
        /** Emitted when a video frame is ready.  These emissions happen in the correct order. */
        boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video;
@@ -117,10 +110,11 @@ private:
        friend struct player_subframe_test;
 
        void setup_pieces ();
+       void setup_pieces_unlocked ();
        void flush ();
-       void film_changed (Film::Property);
-       void playlist_changed ();
-       void playlist_content_changed (boost::weak_ptr<Content>, int, bool);
+       void film_change (ChangeType, Film::Property);
+       void playlist_change (ChangeType);
+       void playlist_content_change (ChangeType, int, bool);
        std::list<PositionImage> transform_bitmap_texts (std::list<BitmapText>) const;
        Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
@@ -153,8 +147,8 @@ private:
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
 
-       /** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */
-       bool _have_valid_pieces;
+       /** true if we are suspended (i.e. pass() and seek() do nothing */
+       bool _suspended;
        std::list<boost::shared_ptr<Piece> > _pieces;
 
        /** Size of the image in the DCP (e.g. 1990x1080 for flat) */
@@ -209,8 +203,8 @@ private:
        boost::shared_ptr<AudioProcessor> _audio_processor;
 
        boost::signals2::scoped_connection _film_changed_connection;
-       boost::signals2::scoped_connection _playlist_changed_connection;
-       boost::signals2::scoped_connection _playlist_content_changed_connection;
+       boost::signals2::scoped_connection _playlist_change_connection;
+       boost::signals2::scoped_connection _playlist_content_change_connection;
 };
 
 #endif