X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=8a81146c9547fb7d7612dc59e38d3f1b0d289880;hp=2f1baa53c1659e296af43da5c5522114869b50db;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=ae95d9cab28e414245e15ddeae20e96735594a8b diff --git a/src/lib/player.h b/src/lib/player.h index 2f1baa53c..8a81146c9 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -22,7 +22,7 @@ #define DCPOMATIC_PLAYER_H #include "player_text.h" -#include "active_subtitles.h" +#include "active_text.h" #include "content_text.h" #include "film.h" #include "content.h" @@ -59,7 +59,7 @@ public: }; /** @class Player - * @brief A class which can `play' a Playlist. + * @brief A class which can play a Playlist. */ class Player : public boost::enable_shared_from_this, public boost::noncopyable { @@ -73,35 +73,30 @@ public: std::list > get_subtitle_fonts (); std::list get_reel_assets (); dcp::Size video_container_size () const { + boost::mutex::scoped_lock lm (_mutex); return _video_container_size; } void set_video_container_size (dcp::Size); void set_ignore_video (); - void set_ignore_subtitle (); - void set_always_burn_subtitles (bool burn); + void set_ignore_audio (); + void set_ignore_text (); + void set_always_burn_open_subtitles (); void set_fast (); void set_play_referenced (); void set_dcp_decode_reduction (boost::optional reduction); - DCPTime content_time_to_dcp (boost::shared_ptr content, ContentTime t); + boost::optional content_time_to_dcp (boost::shared_ptr 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 Changed; + 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; - /** Emitted when a subtitle is ready. This signal may be emitted considerably + boost::signals2::signal, DCPTime, int)> Audio; + /** Emitted when a text is ready. This signal may be emitted considerably * after the corresponding Video. */ - boost::signals2::signal Subtitle; + boost::signals2::signal, DCPTimePeriod)> Text; private: friend class PlayerWrapper; @@ -110,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, int, bool); - std::list transform_bitmap_texts (std::list) 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, 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; @@ -126,24 +123,30 @@ private: 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, ContentBitmapText); - void plain_text_start (boost::weak_ptr, ContentPlainText); - void subtitle_stop (boost::weak_ptr, ContentTime); + 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); DCPTime one_video_frame () const; void fill_audio (DCPTimePeriod period); std::pair, DCPTime> discard_audio ( boost::shared_ptr audio, DCPTime time, DCPTime discard_to ) const; - boost::optional subtitles_for_frame (DCPTime time) 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); + /** 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 + from the GUI thread. + */ + mutable boost::mutex _mutex; + boost::shared_ptr _film; boost::shared_ptr _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 > _pieces; /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ @@ -152,12 +155,10 @@ private: /** true if the player should ignore all video; i.e. never produce any */ bool _ignore_video; - /** true if the player should ignore all audio; i.e. never produce any */ - bool _ignore_subtitle; - /** true if the player should always burn subtitles into the video regardless - of content settings - */ - bool _always_burn_subtitles; + bool _ignore_audio; + /** true if the player should ignore all text; i.e. never produce any */ + bool _ignore_text; + bool _always_burn_open_subtitles; /** true if we should try to be fast rather than high quality */ bool _fast; /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ @@ -196,12 +197,12 @@ private: Empty _black; Empty _silent; - ActiveSubtitles _active_subtitles; + ActiveText _active_texts[TEXT_COUNT]; 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_changed_connection; + boost::signals2::scoped_connection _playlist_change_connection; + boost::signals2::scoped_connection _playlist_content_change_connection; }; #endif