X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=01439a26f00e2c272c6adf8226f8e50643bb38f6;hb=54c0378137091de604b8c0d6d98959b55b0cddb6;hp=7fbeebc8c2f4432c85bd101fc3c2bea18ae0fc12;hpb=94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 7fbeebc8c..01439a26f 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -20,9 +20,6 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include "playlist.h"
 #include "content.h"
 #include "film.h"
@@ -34,6 +31,9 @@
 #include "piece.h"
 #include "content_video.h"
 #include "player_subtitles.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
 
 class Job;
 class Film;
@@ -89,9 +89,11 @@ public:
 	std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
 	boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
 	PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting);
+	std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
 
 	void set_video_container_size (dcp::Size);
 	void set_approximate_size ();
+	void set_ignore_video ();
 
 	PlayerStatistics const & statistics () const;
 	
@@ -106,7 +108,7 @@ public:
 private:
 	friend class PlayerWrapper;
 	friend class Piece;
-	friend class player_overlaps_test;
+	friend struct player_overlaps_test;
 
 	void setup_pieces ();
 	void playlist_changed ();
@@ -151,11 +153,13 @@ private:
 	bool _have_valid_pieces;
 	std::list<boost::shared_ptr<Piece> > _pieces;
 
+	/** Size of the image in the DCP (e.g. 1990x1080 for flat) */
 	dcp::Size _video_container_size;
 	boost::shared_ptr<Image> _black_image;
 
 	bool _approximate_size;
-	bool _burn_subtitles;
+	/** true if the player should ignore all video; i.e. never produce any */
+	bool _ignore_video;
 
 	PlayerStatistics _statistics;