X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=52dffec24656a1edadcefab42756ea73bb6844d2;hb=bdbfd6b08856a445446bfd845f1c43109d184250;hp=3852965853ed5ef17a0624a04018a4409352a0f3;hpb=dd4f004b40c3d48f984c24b63421f42c12dbf9cf;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 385296585..52dffec24 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,12 @@ 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 ();
+	void set_enable_subtitles (bool enable);
+	void set_burn_subtitles (bool burn);
 
 	PlayerStatistics const & statistics () const;
 	
@@ -115,9 +118,9 @@ private:
 	void film_changed (Film::Property);
 	std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const;
 	void update_subtitle_from_text ();
-	VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-	DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, VideoFrame f) const;
-	AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) 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;
+	Frame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
 	ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
 	boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
 
@@ -155,9 +158,13 @@ private:
 	dcp::Size _video_container_size;
 	boost::shared_ptr<Image> _black_image;
 
-	bool _approximate_size;
+	/** true if the player should ignore all video; i.e. never produce any */
+	bool _ignore_video;
+	/** true if the player should burn subtitles into the video */
 	bool _burn_subtitles;
 
+	boost::shared_ptr<AudioProcessor> _audio_processor;
+
 	PlayerStatistics _statistics;
 
 	boost::signals2::scoped_connection _playlist_changed_connection;