X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=8a81146c9547fb7d7612dc59e38d3f1b0d289880;hb=bd68f5a27795cb9151633bac810c53bae4ec4bf4;hp=c6e657d162cf0558b7191bd2a3a5d728d5fe25d9;hpb=c9a97108df1d609bd13df8a21bee11d7ca55feea;p=dcpomatic.git

diff --git a/src/lib/player.h b/src/lib/player.h
index c6e657d16..8a81146c9 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -56,9 +56,6 @@ public:
 	static int const FILM_CONTAINER;
 	static int const FILM_VIDEO_FRAME_RATE;
 	static int const DCP_DECODE_REDUCTION;
-	static int const IGNORE_COMPONENTS;
-	static int const FAST;
-	static int const PLAY_REFERENCED;
 };
 
 /** @class Player
@@ -89,24 +86,17 @@ public:
 	void set_play_referenced ();
 	void set_dcp_decode_reduction (boost::optional<int> reduction);
 
-	DCPTime content_time_to_dcp (boost::shared_ptr<Content> content, ContentTime t);
+	boost::optional<DCPTime> content_time_to_dcp (boost::shared_ptr<Content> content, ContentTime t);
 
-	/** 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 first parameter is what changed.
-	 *  The second parameter is true if these signals are currently likely to be frequent.
-	 */
-	boost::signals2::signal<void (int, bool)> Changed;
+	boost::signals2::signal<void (ChangeType, int, bool)> Change;
 
 	/** Emitted when a video frame is ready.  These emissions happen in the correct order. */
 	boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video;
-	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio;
+	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime, int)> Audio;
 	/** Emitted when a text is ready.  This signal may be emitted considerably
 	 *  after the corresponding Video.
 	 */
-	boost::signals2::signal<void (PlayerText, TextType, DCPTimePeriod)> Text;
+	boost::signals2::signal<void (PlayerText, TextType, boost::optional<DCPTextTrack>, DCPTimePeriod)> Text;
 
 private:
 	friend class PlayerWrapper;
@@ -115,13 +105,15 @@ private:
 	friend struct player_time_calculation_test2;
 	friend struct player_time_calculation_test3;
 	friend struct player_subframe_test;
+	friend struct empty_test1;
+	friend struct empty_test2;
 
 	void setup_pieces ();
+	void setup_pieces_unlocked ();
 	void flush ();
-	void film_changed (Film::Property);
-	void playlist_changed ();
-	void playlist_content_changed (boost::weak_ptr<Content>, int, bool);
-	std::list<PositionImage> transform_bitmap_texts (std::list<BitmapText>) const;
+	void film_change (ChangeType, Film::Property);
+	void playlist_change (ChangeType);
+	void playlist_content_change (ChangeType, int, bool);
 	Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
 	DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
 	Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
@@ -133,7 +125,7 @@ private:
 	void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
 	void bitmap_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentBitmapText);
 	void plain_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentStringText);
-	void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentTime, TextType);
+	void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentTime);
 	DCPTime one_video_frame () const;
 	void fill_audio (DCPTimePeriod period);
 	std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (
@@ -153,8 +145,8 @@ private:
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
 
-	/** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */
-	bool _have_valid_pieces;
+	/** true if we are suspended (i.e. pass() and seek() do nothing) */
+	bool _suspended;
 	std::list<boost::shared_ptr<Piece> > _pieces;
 
 	/** Size of the image in the DCP (e.g. 1990x1080 for flat) */
@@ -209,8 +201,8 @@ private:
 	boost::shared_ptr<AudioProcessor> _audio_processor;
 
 	boost::signals2::scoped_connection _film_changed_connection;
-	boost::signals2::scoped_connection _playlist_changed_connection;
-	boost::signals2::scoped_connection _playlist_content_changed_connection;
+	boost::signals2::scoped_connection _playlist_change_connection;
+	boost::signals2::scoped_connection _playlist_content_change_connection;
 };
 
 #endif