X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=694ee70b77cca871eb83854a2b3a8c0a964da1f7;hb=5a820bb8fae34591be5ac6d19a73461b9dab532a;hp=b74aeeefd8f0ab994eb604fcd77ca421f11ec64c;hpb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index b74aeeefd..694ee70b7 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -27,7 +27,6 @@
 #include "atmos_metadata.h"
 #include "audio_merger.h"
 #include "audio_stream.h"
-#include "content.h"
 #include "content_atmos.h"
 #include "content_audio.h"
 #include "content_text.h"
@@ -35,7 +34,6 @@
 #include "empty.h"
 #include "film.h"
 #include "image.h"
-#include "piece.h"
 #include "player_text.h"
 #include "position_image.h"
 #include "shuffler.h"
@@ -47,16 +45,12 @@ namespace dcp {
 	class ReelAsset;
 }
 
-namespace dcpomatic {
-	class FontData;
-}
-
 class AtmosContent;
+class AudioBuffers;
+class Content;
 class PlayerVideo;
 class Playlist;
-class AudioBuffers;
 class ReferencedReelAsset;
-class Shuffler;
 
 
 class PlayerProperty
@@ -86,7 +80,7 @@ public:
 	bool pass ();
 	void seek (dcpomatic::DCPTime time, bool accurate);
 
-	std::vector<dcpomatic::FontData> get_subtitle_fonts ();
+	std::vector<std::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);
@@ -102,7 +96,8 @@ public:
 	void set_play_referenced ();
 	void set_dcp_decode_reduction (boost::optional<int> reduction);
 
-	boost::optional<dcpomatic::DCPTime> content_time_to_dcp (std::shared_ptr<Content> content, dcpomatic::ContentTime t);
+	boost::optional<dcpomatic::DCPTime> content_time_to_dcp (std::shared_ptr<const Content> content, dcpomatic::ContentTime t);
+	boost::optional<dcpomatic::ContentTime> dcp_to_content_time (std::shared_ptr<const Content> content, dcpomatic::DCPTime t);
 
 	boost::signals2::signal<void (ChangeType, int, bool)> Change;
 
@@ -133,7 +128,6 @@ private:
 	void construct ();
 	void setup_pieces ();
 	void setup_pieces_unlocked ();
-	void flush ();
 	void film_change (ChangeType, Film::Property);
 	void playlist_change (ChangeType);
 	void playlist_content_change (ChangeType, int, bool);
@@ -175,7 +169,7 @@ private:
 
 	/** > 0 if we are suspended (i.e. pass() and seek() do nothing) */
 	boost::atomic<int> _suspended;
-	std::list<std::shared_ptr<Piece> > _pieces;
+	std::list<std::shared_ptr<Piece>> _pieces;
 
 	/** Size of the image we are rendering to; this may be the DCP frame size, or
 	 *  the size of preview in a window.
@@ -196,11 +190,12 @@ private:
 	/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
 	bool _play_referenced = false;
 
-	/** Time just after the last video frame we emitted, or the time of the last accurate seek */
-	boost::optional<dcpomatic::DCPTime> _last_video_time;
-	boost::optional<Eyes> _last_video_eyes;
-	/** Time just after the last audio frame we emitted, or the time of the last accurate seek */
-	boost::optional<dcpomatic::DCPTime> _last_audio_time;
+	/** Time of the next video that we will emit, or the time of the last accurate seek */
+	boost::optional<dcpomatic::DCPTime> _next_video_time;
+	/** Eyes of the next video that we will emit */
+	boost::optional<Eyes> _next_video_eyes;
+	/** Time of the next audio that we will emit, or the time of the last accurate seek */
+	boost::optional<dcpomatic::DCPTime> _next_audio_time;
 
 	boost::optional<int> _dcp_decode_reduction;
 
@@ -209,7 +204,7 @@ private:
 
 	AudioMerger _audio_merger;
 	std::unique_ptr<Shuffler> _shuffler;
-	std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> > _delay;
+	std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime>> _delay;
 
 	class StreamState
 	{