X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=381aa80b71c113ab3b615bf5151a10487b9d8596;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=c43cfd40e1eca4d0dc0b154c8aeb71089475c8bc;hpb=1fe6bd7f8ba059322b8357b2210f0fd590567ce2;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index c43cfd40e..381aa80b7 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -68,7 +68,7 @@ public: ~Player (); bool pass (); - void seek (DCPTime time, bool accurate); + void seek (dcpomatic::DCPTime time, bool accurate); std::list > get_subtitle_fonts (); std::list get_reel_assets (); @@ -86,27 +86,17 @@ public: void set_play_referenced (); void set_dcp_decode_reduction (boost::optional reduction); - boost::optional content_time_to_dcp (boost::shared_ptr content, ContentTime t); + boost::optional content_time_to_dcp (boost::shared_ptr content, dcpomatic::ContentTime t); - boost::signals2::signal MayChange; - - /** 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 Changed; - boost::signals2::signal NotChanged; + boost::signals2::signal Change; /** Emitted when a video frame is ready. These emissions happen in the correct order. */ - boost::signals2::signal, DCPTime)> Video; - boost::signals2::signal, DCPTime)> Audio; + boost::signals2::signal, dcpomatic::DCPTime)> Video; + boost::signals2::signal, dcpomatic::DCPTime, int)> Audio; /** Emitted when a text is ready. This signal may be emitted considerably * after the corresponding Video. */ - boost::signals2::signal Text; + boost::signals2::signal, dcpomatic::DCPTimePeriod)> Text; private: friend class PlayerWrapper; @@ -115,37 +105,36 @@ 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_may_change (); - void playlist_content_changed (boost::weak_ptr, int, bool); - void playlist_content_not_changed (); - std::list transform_bitmap_texts (std::list) const; - Frame dcp_to_content_video (boost::shared_ptr piece, DCPTime t) const; - DCPTime content_video_to_dcp (boost::shared_ptr piece, Frame f) const; - Frame dcp_to_resampled_audio (boost::shared_ptr piece, DCPTime t) const; - DCPTime resampled_audio_to_dcp (boost::shared_ptr piece, Frame f) const; - ContentTime dcp_to_content_time (boost::shared_ptr piece, DCPTime t) const; - DCPTime content_time_to_dcp (boost::shared_ptr piece, ContentTime t) 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 piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_video_to_dcp (boost::shared_ptr piece, Frame f) const; + Frame dcp_to_resampled_audio (boost::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime resampled_audio_to_dcp (boost::shared_ptr piece, Frame f) const; + dcpomatic::ContentTime dcp_to_content_time (boost::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_time_to_dcp (boost::shared_ptr piece, dcpomatic::ContentTime t) const; boost::shared_ptr black_player_video_frame (Eyes eyes) const; void video (boost::weak_ptr, ContentVideo); void audio (boost::weak_ptr, AudioStreamPtr, ContentAudio); void bitmap_text_start (boost::weak_ptr, boost::weak_ptr, ContentBitmapText); void plain_text_start (boost::weak_ptr, boost::weak_ptr, ContentStringText); - void subtitle_stop (boost::weak_ptr, boost::weak_ptr, ContentTime, TextType); - DCPTime one_video_frame () const; - void fill_audio (DCPTimePeriod period); - std::pair, DCPTime> discard_audio ( - boost::shared_ptr audio, DCPTime time, DCPTime discard_to + void subtitle_stop (boost::weak_ptr, boost::weak_ptr, dcpomatic::ContentTime); + dcpomatic::DCPTime one_video_frame () const; + void fill_audio (dcpomatic::DCPTimePeriod period); + std::pair, dcpomatic::DCPTime> discard_audio ( + boost::shared_ptr audio, dcpomatic::DCPTime time, dcpomatic::DCPTime discard_to ) const; - boost::optional open_subtitles_for_frame (DCPTime time) const; - void emit_video (boost::shared_ptr pv, DCPTime time); - void do_emit_video (boost::shared_ptr pv, DCPTime time); - void emit_audio (boost::shared_ptr data, DCPTime time); + boost::optional open_subtitles_for_frame (dcpomatic::DCPTime time) const; + void emit_video (boost::shared_ptr pv, dcpomatic::DCPTime time); + void do_emit_video (boost::shared_ptr pv, dcpomatic::DCPTime time); + void emit_audio (boost::shared_ptr data, dcpomatic::DCPTime time); /** Mutex to protect the whole Player state. When it's used for the preview we have seek() and pass() called from the Butler thread and lots of other stuff called @@ -156,8 +145,8 @@ private: boost::shared_ptr _film; boost::shared_ptr _playlist; - /** We can pass() and seek() */ - bool _can_run; + /** true if we are suspended (i.e. pass() and seek() do nothing) */ + bool _suspended; std::list > _pieces; /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ @@ -176,10 +165,10 @@ private: bool _play_referenced; /** Time just after the last video frame we emitted, or the time of the last accurate seek */ - boost::optional _last_video_time; + boost::optional _last_video_time; boost::optional _last_video_eyes; /** Time just after the last audio frame we emitted, or the time of the last accurate seek */ - boost::optional _last_audio_time; + boost::optional _last_audio_time; boost::optional _dcp_decode_reduction; @@ -188,20 +177,20 @@ private: AudioMerger _audio_merger; Shuffler* _shuffler; - std::list, DCPTime> > _delay; + std::list, dcpomatic::DCPTime> > _delay; class StreamState { public: StreamState () {} - StreamState (boost::shared_ptr p, DCPTime l) + StreamState (boost::shared_ptr p, dcpomatic::DCPTime l) : piece(p) , last_push_end(l) {} boost::shared_ptr piece; - DCPTime last_push_end; + dcpomatic::DCPTime last_push_end; }; std::map _stream_states; @@ -212,10 +201,8 @@ private: boost::shared_ptr _audio_processor; boost::signals2::scoped_connection _film_changed_connection; - boost::signals2::scoped_connection _playlist_changed_connection; - boost::signals2::scoped_connection _playlist_content_may_change_connection; - boost::signals2::scoped_connection _playlist_content_changed_connection; - boost::signals2::scoped_connection _playlist_content_not_changed_connection; + boost::signals2::scoped_connection _playlist_change_connection; + boost::signals2::scoped_connection _playlist_content_change_connection; }; #endif