X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=11cc99e7793005630a5e9ce1014e5827bdf55ed4;hb=a3241f40b061480a0907699a5857075388216643;hp=903d011d0aad99a64bc4650786f20c174e8b65a8;hpb=d0d584a7dde6de383302615634fdee17e9724fe8;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index 903d011d0..11cc99e77 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -24,8 +24,11 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include "playlist.h"
-#include "audio_buffers.h"
 #include "content.h"
+#include "film.h"
+#include "rect.h"
+#include "audio_merger.h"
+#include "audio_content.h"
 
 class Job;
 class Film;
@@ -38,8 +41,41 @@ class Resampler;
 /** @class Player
  *  @brief A class which can `play' a Playlist; emitting its audio and video.
  */
+
+struct IncomingVideo
+{
+public:
+	boost::weak_ptr<Piece> weak_piece;
+	boost::shared_ptr<const Image> image;
+	Eyes eyes;
+	bool same;
+	VideoContent::Frame frame;
+	Time extra;
+};
+
+/** A wrapper for an Image which contains some pending operations; these may
+ *  not be necessary if the receiver of the PlayerImage throws it away.
+ */
+class PlayerImage
+{
+public:
+	PlayerImage (boost::shared_ptr<const Image>, Crop, libdcp::Size, libdcp::Size, Scaler const *);
+
+	void set_subtitle (boost::shared_ptr<const Image>, Position<int>);
+	
+	boost::shared_ptr<Image> image ();
+
+private:
+	boost::shared_ptr<const Image> _in;
+	Crop _crop;
+	libdcp::Size _inter_size;
+	libdcp::Size _out_size;
+	Scaler const * _scaler;
+	boost::shared_ptr<const Image> _subtitle_image;
+	Position<int> _subtitle_position;
+};
  
-class Player : public boost::enable_shared_from_this<Player>
+class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
@@ -48,38 +84,53 @@ public:
 	void disable_audio ();
 
 	bool pass ();
-	void seek (Time);
-	void seek_back ();
+	void seek (Time, bool);
 
-	/** @return position that we are at; ie the time of the next thing we will emit on pass() */
-	Time position () const {
-		return _position;
+	Time video_position () const {
+		return _video_position;
 	}
 
 	void set_video_container_size (libdcp::Size);
 
+	bool repeat_last_video ();
+
 	/** Emitted when a video frame is ready.
 	 *  First parameter is the video image.
-	 *  Second parameter is true if the image is the same as the last one that was emitted.
-	 *  Third parameter is the time.
+	 *  Second parameter is the eye(s) that should see this image.
+	 *  Third parameter is the colour conversion that should be used for this image.
+	 *  Fourth parameter is true if the image is the same as the last one that was emitted.
+	 *  Fifth parameter is the time.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, Time)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<PlayerImage>, Eyes, ColourConversion, bool, Time)> Video;
 	
 	/** Emitted when some audio data is ready */
 	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, Time)> Audio;
 
+	/** Emitted when something has changed such that if we went back and emitted
+	 *  the last frame again it would look different.  This is not emitted after
+	 *  a seek.
+	 *
+	 *  The parameter is true if these signals are currently likely to be frequent.
+	 */
+	boost::signals2::signal<void (bool)> Changed;
+
 private:
+	friend class PlayerWrapper;
+	friend class Piece;
 
-	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame, Time);
 	void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	void process_subtitle (boost::weak_ptr<Piece>, boost::shared_ptr<Image>, dcpomatic::Rect<double>, Time, Time);
 	void setup_pieces ();
 	void playlist_changed ();
-	void content_changed (boost::weak_ptr<Content>, int);
+	void content_changed (boost::weak_ptr<Content>, int, bool);
 	void do_seek (Time, bool);
-	void add_black_piece (Time, Time);
-	void add_silent_piece (Time, Time);
 	void flush ();
-	boost::shared_ptr<Resampler> resampler (boost::shared_ptr<AudioContent>);
+	void emit_black ();
+	void emit_silence (OutputAudioFrame);
+	boost::shared_ptr<Resampler> resampler (boost::shared_ptr<AudioContent>, bool);
+	void film_changed (Film::Property);
+	void update_subtitle ();
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
@@ -90,11 +141,44 @@ private:
 	/** 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;
-	Time _position;
-	AudioBuffers _audio_buffers;
-	Time _next_audio;
-	boost::optional<libdcp::Size> _video_container_size;
+
+	/** The time after the last video that we emitted */
+	Time _video_position;
+	/** The time after the last audio that we emitted */
+	Time _audio_position;
+
+	AudioMerger<Time, AudioContent::Frame> _audio_merger;
+
+	libdcp::Size _video_container_size;
+	boost::shared_ptr<PlayerImage> _black_frame;
 	std::map<boost::shared_ptr<AudioContent>, boost::shared_ptr<Resampler> > _resamplers;
+
+	struct {
+		boost::weak_ptr<Piece> piece;
+		boost::shared_ptr<Image> image;
+		dcpomatic::Rect<double> rect;
+		Time from;
+		Time to;
+	} _in_subtitle;
+
+	struct {
+		boost::shared_ptr<Image> image;
+		Position<int> position;
+		Time from;
+		Time to;
+	} _out_subtitle;
+
+#ifdef DCPOMATIC_DEBUG
+	boost::shared_ptr<Content> _last_video;
+#endif
+
+	bool _last_emit_was_black;
+
+	IncomingVideo _last_incoming_video;
+
+	boost::signals2::scoped_connection _playlist_changed_connection;
+	boost::signals2::scoped_connection _playlist_content_changed_connection;
+	boost::signals2::scoped_connection _film_changed_connection;
 };
 
 #endif