X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=e99c345bb211ea99d683fcb5b3d32513305ad4c9;hb=0486d4d94900c7f2a2cab7885b3f162d1ad8290c;hp=381aa80b71c113ab3b615bf5151a10487b9d8596;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 381aa80b7..e99c345bb 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -41,9 +41,12 @@ namespace dcp {
 	class ReelAsset;
 }
 
+namespace dcpomatic {
+	class Font;
+}
+
 class PlayerVideo;
 class Playlist;
-class Font;
 class AudioBuffers;
 class ReferencedReelAsset;
 class Shuffler;
@@ -70,7 +73,7 @@ public:
 	bool pass ();
 	void seek (dcpomatic::DCPTime time, bool accurate);
 
-	std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
+	std::list<boost::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);
@@ -107,6 +110,7 @@ private:
 	friend struct player_subframe_test;
 	friend struct empty_test1;
 	friend struct empty_test2;
+	friend struct check_reuse_old_data_test;
 
 	void setup_pieces ();
 	void setup_pieces_unlocked ();
@@ -161,6 +165,8 @@ private:
 	bool _always_burn_open_subtitles;
 	/** true if we should try to be fast rather than high quality */
 	bool _fast;
+	/** true if we should keep going in the face of `survivable' errors */
+	bool _tolerant;
 	/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
 	bool _play_referenced;