Use atomic for _ignore_video.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index b70ea05ddeb972322a9dd0e4237d6cbd64891945..c65ec40fe561f621cbd2a3a6aa4a80cdebc221ae 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -45,10 +45,6 @@ namespace dcp {
        class ReelAsset;
 }
 
-namespace dcpomatic {
-       class FontData;
-}
-
 class AtmosContent;
 class AudioBuffers;
 class Content;
@@ -84,7 +80,7 @@ public:
        bool pass ();
        void seek (dcpomatic::DCPTime time, bool accurate);
 
-       std::vector<dcpomatic::FontData> get_subtitle_fonts ();
+       std::vector<std::shared_ptr<dcpomatic::Font>> get_subtitle_fonts ();
        std::list<ReferencedReelAsset> get_reel_assets ();
        dcp::Size video_container_size () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -101,6 +97,7 @@ public:
        void set_dcp_decode_reduction (boost::optional<int> reduction);
 
        boost::optional<dcpomatic::DCPTime> content_time_to_dcp (std::shared_ptr<const Content> content, dcpomatic::ContentTime t);
+       boost::optional<dcpomatic::ContentTime> dcp_to_content_time (std::shared_ptr<const Content> content, dcpomatic::DCPTime t);
 
        boost::signals2::signal<void (ChangeType, int, bool)> Change;
 
@@ -166,9 +163,9 @@ private:
        */
        mutable boost::mutex _mutex;
 
-       std::shared_ptr<const Film> _film;
+       std::shared_ptr<const Film> const _film;
        /** Playlist, or 0 if we are using the one from the _film */
-       std::shared_ptr<const Playlist> _playlist;
+       std::shared_ptr<const Playlist> const _playlist;
 
        /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */
        boost::atomic<int> _suspended;
@@ -181,7 +178,7 @@ private:
        std::shared_ptr<Image> _black_image;
 
        /** true if the player should ignore all video; i.e. never produce any */
-       bool _ignore_video = false;
+       boost::atomic<bool> _ignore_video;
        bool _ignore_audio = false;
        /** true if the player should ignore all text; i.e. never produce any */
        bool _ignore_text = false;
@@ -189,7 +186,7 @@ private:
        /** true if we should try to be fast rather than high quality */
        bool _fast = false;
        /** true if we should keep going in the face of `survivable' errors */
-       bool _tolerant = false;
+       bool const _tolerant;
        /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
        bool _play_referenced = false;
 
@@ -233,7 +230,7 @@ private:
        dcpomatic::DCPTime _playback_length;
 
        /** Alignment for subtitle images that we create */
-       Image::Alignment _subtitle_alignment = Image::Alignment::PADDED;
+       Image::Alignment const _subtitle_alignment = Image::Alignment::PADDED;
 
        boost::signals2::scoped_connection _film_changed_connection;
        boost::signals2::scoped_connection _playlist_change_connection;