X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=5b1b6936bc95a41ca548fef98f32cc146da9a628;hb=d9362bdd24f01e4c833e89d63ac3816f36eae36e;hp=e4fb832209025117a3f5c02414a3d429bf62bc5a;hpb=8db8de91e2a5489da345fae7544753f4cb2f5ab4;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index e4fb83220..5b1b6936b 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -23,24 +23,24 @@
 #include <list>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include "video_source.h"
-#include "audio_source.h"
-#include "video_sink.h"
-#include "audio_sink.h"
 #include "playlist.h"
 #include "audio_buffers.h"
+#include "content.h"
+#include "film.h"
+#include "rect.h"
 
 class Job;
 class Film;
 class Playlist;
 class AudioContent;
 class Piece;
+class Image;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist; emitting its audio and video.
  */
  
-class Player : public VideoSource, public AudioSource, 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>);
@@ -49,28 +49,48 @@ public:
 	void disable_audio ();
 
 	bool pass ();
-	void seek (Time);
-	void seek_back ();
-	void seek_forward ();
+	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);
 
+	/** Emitted when a video frame is ready.
+	 *  First parameter is the video image.
+	 *  Second parameter is the eye(s) that should see this image.
+	 *  Third parameter is true if the image is the same as the last one that was emitted.
+	 *  Fourth parameter is the time.
+	 */
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, 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;
 
-	void process_video (boost::weak_ptr<Content>, boost::shared_ptr<const Image>, bool, Time);
-	void process_audio (boost::weak_ptr<Content>, boost::shared_ptr<const AudioBuffers>, Time);
+	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame);
+	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 ();
+	void emit_black ();
+	void emit_silence (OutputAudioFrame);
+	void film_changed (Film::Property);
+	void update_subtitle ();
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
@@ -81,10 +101,35 @@ 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;
+
+	/** The time after the last video that we emitted */
+	Time _video_position;
+	/** The time after the last audio that we emitted */
+	Time _audio_position;
+
 	AudioBuffers _audio_buffers;
-	Time _next_audio;
-	boost::optional<libdcp::Size> _video_container_size;
+
+	libdcp::Size _video_container_size;
+	boost::shared_ptr<Image> _black_frame;
+
+	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	
 };
 
 #endif