X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=20d9c9388b33fa00464aa06609a836514220571e;hb=9fc3a67c727896d2170888ae60c9745ebbfdca95;hp=ea07e1fc8bb0e0503168fd71c654688e9696f98c;hpb=4073923b2c5ccf127c61435cd575542351421f05;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index ea07e1fc8..20d9c9388 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -22,6 +22,7 @@
 #define DCPOMATIC_PLAYER_H
 
 #include "player_subtitles.h"
+#include "active_subtitles.h"
 #include "film.h"
 #include "content.h"
 #include "position_image.h"
@@ -44,7 +45,6 @@ class Playlist;
 class Font;
 class AudioBuffers;
 class ReferencedReelAsset;
-class Resampler;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist.
@@ -62,8 +62,6 @@ public:
 
 	void set_video_container_size (dcp::Size);
 	void set_ignore_video ();
-	void set_ignore_audio ();
-	void set_enable_subtitles (bool enable);
 	void set_always_burn_subtitles (bool burn);
 	void set_fast ();
 	void set_play_referenced ();
@@ -78,12 +76,14 @@ public:
 
 	boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video;
 	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio;
+	/** Emitted when a subtitle is ready.  This signal may be emitted considerably
+	 *  after the corresponding Video.
+	 */
 	boost::signals2::signal<void (PlayerSubtitles, DCPTimePeriod)> Subtitle;
 
 private:
 	friend class PlayerWrapper;
 	friend class Piece;
-	friend struct player_overlaps_test;
 	friend struct player_time_calculation_test1;
 	friend struct player_time_calculation_test2;
 	friend struct player_time_calculation_test3;
@@ -101,17 +101,20 @@ private:
 	ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, DCPTime t) const;
 	DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const;
 	boost::shared_ptr<PlayerVideo> black_player_video_frame () const;
-	std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid);
 	void video (boost::weak_ptr<Piece>, ContentVideo);
 	void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
-	void image_subtitle (boost::weak_ptr<Piece>, ContentImageSubtitle);
-	void text_subtitle (boost::weak_ptr<Piece>, ContentTextSubtitle);
-	boost::shared_ptr<Resampler> resampler (boost::shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create);
+	void image_subtitle_start (boost::weak_ptr<Piece>, ContentImageSubtitle);
+	void text_subtitle_start (boost::weak_ptr<Piece>, ContentTextSubtitle);
+	void subtitle_stop (boost::weak_ptr<Piece>, ContentTime);
 	DCPTime one_video_frame () const;
-	void fill_video (DCPTimePeriod period);
 	void fill_audio (DCPTimePeriod period);
-	void audio_flush (boost::shared_ptr<Piece>, AudioStreamPtr stream);
 	void audio_transform (boost::shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time);
+	std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (
+		boost::shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTime discard_to
+		) const;
+	boost::optional<PositionImage> subtitles_for_frame (DCPTime time) const;
+	void emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
+	void emit_audio (boost::shared_ptr<AudioBuffers> data, DCPTime time);
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
@@ -137,15 +140,18 @@ private:
 	/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
 	bool _play_referenced;
 
-	/** Last PlayerVideo that was emitted */
-	boost::shared_ptr<PlayerVideo> _last_video;
-	/** Time of the last video we emitted, or the last seek time */
+	/** Time just after the last video frame we emitted, or the time of the last accurate seek */
 	boost::optional<DCPTime> _last_video_time;
+	/** Time just after the last audio frame we emitted, or the time of the last accurate seek */
+	boost::optional<DCPTime> _last_audio_time;
+
+	typedef std::map<boost::weak_ptr<Piece>, boost::shared_ptr<PlayerVideo> > LastVideoMap;
+	LastVideoMap _last_video;
 
 	AudioMerger _audio_merger;
-	boost::optional<DCPTime> _last_audio_time;
 
-	class StreamState {
+	class StreamState
+	{
 	public:
 		StreamState () {}
 
@@ -162,11 +168,8 @@ private:
 	std::list<DCPTimePeriod> _no_video;
 	std::list<DCPTimePeriod> _no_audio;
 
-	std::list<std::pair<PlayerSubtitles, DCPTimePeriod> > _subtitles;
-
+	ActiveSubtitles _active_subtitles;
 	boost::shared_ptr<AudioProcessor> _audio_processor;
-	typedef std::map<std::pair<boost::shared_ptr<const AudioContent>, AudioStreamPtr>, boost::shared_ptr<Resampler> > ResamplerMap;
-	ResamplerMap _resamplers;
 
 	boost::signals2::scoped_connection _film_changed_connection;
 	boost::signals2::scoped_connection _playlist_changed_connection;