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

diff --git a/src/lib/player.h b/src/lib/player.h
index ce49af148..694ee70b7 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -18,40 +18,40 @@
 
 */
 
+
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include "atmos_metadata.h"
-#include "player_text.h"
+
 #include "active_text.h"
-#include "content_text.h"
-#include "film.h"
-#include "content.h"
+#include "atmos_metadata.h"
+#include "audio_merger.h"
+#include "audio_stream.h"
 #include "content_atmos.h"
-#include "position_image.h"
-#include "piece.h"
-#include "content_video.h"
 #include "content_audio.h"
-#include "audio_stream.h"
-#include "audio_merger.h"
+#include "content_text.h"
+#include "content_video.h"
 #include "empty.h"
+#include "film.h"
+#include "image.h"
+#include "player_text.h"
+#include "position_image.h"
+#include "shuffler.h"
 #include <boost/atomic.hpp>
 #include <list>
 
+
 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
 {
@@ -64,22 +64,23 @@ public:
 	static int const PLAYBACK_LENGTH;
 };
 
+
 /** @class Player
  *  @brief A class which can play a Playlist.
  */
 class Player : public std::enable_shared_from_this<Player>
 {
 public:
-	Player (std::shared_ptr<const Film>);
+	Player (std::shared_ptr<const Film>, Image::Alignment subtitle_alignment);
 	Player (std::shared_ptr<const Film>, std::shared_ptr<const Playlist> playlist);
-	~Player ();
 
 	Player (Player const& Player) = delete;
 	Player& operator= (Player const& Player) = delete;
+
 	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);
@@ -95,12 +96,16 @@ 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;
 
 	/** Emitted when a video frame is ready.  These emissions happen in the correct order. */
 	boost::signals2::signal<void (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime)> Video;
+	/** Emitted when audio data is ready.  First parameter is the audio data, second its time,
+	 *  third the frame rate.
+	 */
 	boost::signals2::signal<void (std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime, int)> Audio;
 	/** Emitted when a text is ready.  This signal may be emitted considerably
 	 *  after the corresponding Video.
@@ -118,11 +123,11 @@ private:
 	friend struct empty_test1;
 	friend struct empty_test2;
 	friend struct check_reuse_old_data_test;
+	friend struct overlap_video_test1;
 
 	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);
@@ -164,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.
@@ -185,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;
 
@@ -197,8 +203,8 @@ private:
 	LastVideoMap _last_video;
 
 	AudioMerger _audio_merger;
-	Shuffler* _shuffler = nullptr;
-	std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> > _delay;
+	std::unique_ptr<Shuffler> _shuffler;
+	std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime>> _delay;
 
 	class StreamState
 	{
@@ -223,9 +229,13 @@ private:
 
 	dcpomatic::DCPTime _playback_length;
 
+	/** Alignment for subtitle images that we create */
+	Image::Alignment _subtitle_alignment = Image::Alignment::PADDED;
+
 	boost::signals2::scoped_connection _film_changed_connection;
 	boost::signals2::scoped_connection _playlist_change_connection;
 	boost::signals2::scoped_connection _playlist_content_change_connection;
 };
 
+
 #endif