X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=ce8b7cc5a53894fcc6d727d5ae790f393c0417f9;hb=959034cec386965f41a781c3ae6929bf7b14318c;hp=8fc02d9c676312829ce8fb2ee497bf9c0ebeefd2;hpb=a7dab6e86e66269df937650a6e5ed7f63a3757ac;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 8fc02d9c6..ce8b7cc5a 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,15 +64,15 @@ 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;
@@ -80,10 +80,9 @@ 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);
 		return _video_container_size;
 	}
 
@@ -96,7 +95,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;
 
@@ -127,7 +127,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);
@@ -163,47 +162,48 @@ private:
 	*/
 	mutable boost::mutex _mutex;
 
-	std::shared_ptr<const Film> _film;
+	std::shared_ptr<const Film> const _film;
 	/** Playlist, or 0 if we are using the one from the _film */
-	std::shared_ptr<const Playlist> _playlist;
+	std::shared_ptr<const Playlist> const _playlist;
 
 	/** > 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.
 	 */
-	dcp::Size _video_container_size;
+	boost::atomic<dcp::Size> _video_container_size;
 	std::shared_ptr<Image> _black_image;
 
 	/** true if the player should ignore all video; i.e. never produce any */
-	bool _ignore_video = false;
-	bool _ignore_audio = false;
+	boost::atomic<bool> _ignore_video;
+	boost::atomic<bool> _ignore_audio;
 	/** true if the player should ignore all text; i.e. never produce any */
-	bool _ignore_text = false;
-	bool _always_burn_open_subtitles = false;
+	boost::atomic<bool> _ignore_text;
+	boost::atomic<bool> _always_burn_open_subtitles;
 	/** true if we should try to be fast rather than high quality */
-	bool _fast = false;
+	boost::atomic<bool> _fast;
 	/** true if we should keep going in the face of `survivable' errors */
-	bool _tolerant = false;
+	bool const _tolerant;
 	/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
-	bool _play_referenced = false;
+	boost::atomic<bool> _play_referenced;
 
-	/** 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;
+	boost::atomic<boost::optional<int>> _dcp_decode_reduction;
 
 	typedef std::map<std::weak_ptr<Piece>, std::shared_ptr<PlayerVideo>, std::owner_less<std::weak_ptr<Piece>>> LastVideoMap;
 	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
 	{
@@ -228,9 +228,13 @@ private:
 
 	dcpomatic::DCPTime _playback_length;
 
+	/** Alignment for subtitle images that we create */
+	Image::Alignment const _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