X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=e515fced345bdd39a610e70c24c1a9383866663a;hb=3b80b8f8a938dd34ee0e0fbca8fbce6a6850f136;hp=0c58af44503c7588e20db0eeab0c62418f88f705;hpb=712f8144f1992364d79a80b2b586248423f7ac11;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 0c58af445..e515fced3 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -20,10 +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"
 #include "rect.h"
@@ -34,10 +30,12 @@
 #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;
-class Playlist;
 class AudioContent;
 class Piece;
 class Image;
@@ -45,6 +43,7 @@ class Decoder;
 class Resampler;
 class PlayerVideo;
 class ImageProxy;
+class Font;
  
 class PlayerStatistics
 {
@@ -79,19 +78,22 @@ public:
 };
 
 /** @class Player
- *  @brief A class which can `play' a Playlist.
+ *  @brief A class which can `play' a Film.
  */
 class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
-	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+	Player (boost::shared_ptr<const Film>);
 
 	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);
+	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;
 	
@@ -106,18 +108,17 @@ 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> 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;
 
@@ -145,22 +146,25 @@ private:
 	}
 	
 	boost::shared_ptr<const Film> _film;
-	boost::shared_ptr<const Playlist> _playlist;
 
 	/** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */
 	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;
+	/** 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;
-	boost::signals2::scoped_connection _playlist_content_changed_connection;
+	boost::signals2::scoped_connection _film_content_changed_connection;
 	boost::signals2::scoped_connection _film_changed_connection;
 };