X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=b74aeeefd8f0ab994eb604fcd77ca421f11ec64c;hb=bb10e048b22ea9ab4a53d3a5653040d9ab99fcc5;hp=48ed568dad99d445b8e871837489eedabdf50347;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 48ed568da..b74aeeefd 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -18,26 +18,31 @@
 
 */
 
+
 #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 "atmos_metadata.h"
+#include "audio_merger.h"
+#include "audio_stream.h"
 #include "content.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 "piece.h"
+#include "player_text.h"
+#include "position_image.h"
+#include "shuffler.h"
 #include <boost/atomic.hpp>
 #include <list>
 
+
 namespace dcp {
 	class ReelAsset;
 }
@@ -53,6 +58,7 @@ class AudioBuffers;
 class ReferencedReelAsset;
 class Shuffler;
 
+
 class PlayerProperty
 {
 public:
@@ -64,15 +70,18 @@ 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 boost::noncopyable
+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);
@@ -99,6 +108,9 @@ public:
 
 	/** 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.
@@ -116,6 +128,7 @@ 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 ();
@@ -171,17 +184,17 @@ private:
 	std::shared_ptr<Image> _black_image;
 
 	/** true if the player should ignore all video; i.e. never produce any */
-	bool _ignore_video;
-	bool _ignore_audio;
+	bool _ignore_video = false;
+	bool _ignore_audio = false;
 	/** true if the player should ignore all text; i.e. never produce any */
-	bool _ignore_text;
-	bool _always_burn_open_subtitles;
+	bool _ignore_text = false;
+	bool _always_burn_open_subtitles = false;
 	/** true if we should try to be fast rather than high quality */
-	bool _fast;
+	bool _fast = false;
 	/** true if we should keep going in the face of `survivable' errors */
-	bool _tolerant;
+	bool _tolerant = false;
 	/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
-	bool _play_referenced;
+	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;
@@ -195,7 +208,7 @@ private:
 	LastVideoMap _last_video;
 
 	AudioMerger _audio_merger;
-	Shuffler* _shuffler;
+	std::unique_ptr<Shuffler> _shuffler;
 	std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> > _delay;
 
 	class StreamState
@@ -216,14 +229,18 @@ private:
 	Empty _black;
 	Empty _silent;
 
-	ActiveText _active_texts[TEXT_COUNT];
+	ActiveText _active_texts[static_cast<int>(TextType::COUNT)];
 	std::shared_ptr<AudioProcessor> _audio_processor;
 
 	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