X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=e17456cf2d87838861404484822c523e2f47612b;hb=f968fb875135884b0551195edc2315d4be76d5bc;hp=eda2d7eb0c68753d9300e101b9a17f76adcc0a16;hpb=cbd4450197a083bf58bda510e626f73ba583cb66;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index eda2d7eb0..e17456cf2 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -21,9 +21,9 @@ #ifndef DCPOMATIC_PLAYER_H #define DCPOMATIC_PLAYER_H -#include "player_caption.h" -#include "active_captions.h" -#include "content_caption.h" +#include "player_text.h" +#include "active_text.h" +#include "content_text.h" #include "film.h" #include "content.h" #include "position_image.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,33 @@ 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_caption (); - void set_always_burn_captions (CaptionType type); + 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; + + /** The change suggested by a MayChange did not happen */ + boost::signals2::signal NotChanged; /** 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 caption is ready. This signal may be emitted considerably + /** Emitted when a text is ready. This signal may be emitted considerably * after the corresponding Video. */ - boost::signals2::signal Caption; + boost::signals2::signal Text; private: friend class PlayerWrapper; @@ -112,11 +110,12 @@ private: friend struct player_subframe_test; 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_captions (std::list) const; + void film_change (ChangeType, Film::Property); + void playlist_change (ChangeType); + void playlist_content_change (ChangeType, int, bool); + 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; @@ -126,24 +125,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, boost::weak_ptr, ContentBitmapCaption); - void plain_text_start (boost::weak_ptr, boost::weak_ptr, ContentTextCaption); - void subtitle_stop (boost::weak_ptr, boost::weak_ptr, ContentTime, CaptionType); + 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 ) const; - boost::optional captions_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 +157,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 captions; i.e. never produce any */ - bool _ignore_caption; - /** Type of captions that the player should always burn into the video regardless - of content settings. - */ - boost::optional _always_burn_captions; + 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 +199,12 @@ private: Empty _black; Empty _silent; - ActiveCaptions _active_captions[CAPTION_COUNT]; + 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