X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=a3b745c8e4ca69acd641cb106be7b733ca19e7da;hb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;hp=a96c93404e171276b7a00e0e3fdb44cb048bfba2;hpb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index a96c93404..a3b745c8e 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -33,6 +33,7 @@
 #include "position_image.h"
 #include "piece.h"
 #include "content_video.h"
+#include "player_subtitles.h"
 
 class Job;
 class Film;
@@ -42,7 +43,7 @@ class Piece;
 class Image;
 class Decoder;
 class Resampler;
-class PlayerVideoFrame;
+class PlayerVideo;
 class ImageProxy;
  
 class PlayerStatistics
@@ -85,14 +86,12 @@ class Player : public boost::enable_shared_from_this<Player>, public boost::nonc
 public:
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
 
-	std::list<boost::shared_ptr<PlayerVideoFrame> > get_video (DCPTime time, bool accurate);
+	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);
 
 	void set_video_container_size (dcp::Size);
 	void set_approximate_size ();
-	void set_burn_subtitles (bool burn) {
-		_burn_subtitles = burn;
-	}
 
 	PlayerStatistics const & statistics () const;
 	
@@ -107,29 +106,20 @@ public:
 private:
 	friend class PlayerWrapper;
 	friend class Piece;
-	friend class player_overlaps_test;
+	friend struct player_overlaps_test;
 
 	void setup_pieces ();
 	void playlist_changed ();
 	void content_changed (boost::weak_ptr<Content>, int, bool);
 	void flush ();
 	void film_changed (Film::Property);
-	std::list<PositionImage> process_content_image_subtitles (
-		boost::shared_ptr<SubtitleContent>, std::list<boost::shared_ptr<ContentImageSubtitle> >
-		) const;
-	std::list<PositionImage> process_content_text_subtitles (std::list<boost::shared_ptr<ContentTextSubtitle> >) const;
+	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;
 	ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-	boost::shared_ptr<PlayerVideoFrame> black_player_video_frame () const;
-	boost::shared_ptr<PlayerVideoFrame> content_to_player_video_frame (
-		boost::shared_ptr<VideoContent> content,
-		ContentVideo content_video,
-		std::list<boost::shared_ptr<Piece> > subs,
-		DCPTime time,
-		dcp::Size image_size
-		) const;
+	boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
 
 	/** @return Pieces of content type C that overlap a specified time range in the DCP */
 	template<class C>