X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=d16666bc51a4394bd92f49c7cd4fc442f6eca118;hb=de522946acfd022b5084434fbcfd225499a17293;hp=7d99c22c65ccca0448b73ec428b81572db8bc081;hpb=d5c059a2ff9bab5c2973db6bc4860591679dd42b;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 7d99c22c6..d16666bc5 100644
--- 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);
@@ -167,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;
@@ -182,15 +178,15 @@ private:
 	std::shared_ptr<Image> _black_image;
 
 	/** true if the player should ignore all video; i.e. never produce any */
-	bool _ignore_video = false;
-	bool _ignore_audio = false;
+	boost::atomic<bool> _ignore_video;
+	boost::atomic<bool> _ignore_audio;
 	/** true if the player should ignore all text; i.e. never produce any */
-	bool _ignore_text = false;
-	bool _always_burn_open_subtitles = false;
+	boost::atomic<bool> _ignore_text;
+	boost::atomic<bool> _always_burn_open_subtitles;
 	/** true if we should try to be fast rather than high quality */
-	bool _fast = false;
+	boost::atomic<bool> _fast;
 	/** 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;
 
@@ -234,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;