X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=48ed568dad99d445b8e871837489eedabdf50347;hp=c695e02cde177a5a1f0a378c509ac36a1913862b;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=0d35820cf50d2789752b8776683b26d04642518d diff --git a/src/lib/player.h b/src/lib/player.h index c695e02cd..48ed568da 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -35,8 +35,6 @@ #include "audio_stream.h" #include "audio_merger.h" #include "empty.h" -#include -#include #include #include @@ -69,11 +67,11 @@ public: /** @class Player * @brief A class which can play a Playlist. */ -class Player : public boost::enable_shared_from_this, public boost::noncopyable +class Player : public std::enable_shared_from_this, public boost::noncopyable { public: - Player (boost::shared_ptr); - Player (boost::shared_ptr, boost::shared_ptr playlist); + Player (std::shared_ptr); + Player (std::shared_ptr, std::shared_ptr playlist); ~Player (); bool pass (); @@ -95,18 +93,18 @@ public: void set_play_referenced (); void set_dcp_decode_reduction (boost::optional reduction); - boost::optional content_time_to_dcp (boost::shared_ptr content, dcpomatic::ContentTime t); + boost::optional content_time_to_dcp (std::shared_ptr content, dcpomatic::ContentTime t); boost::signals2::signal Change; /** Emitted when a video frame is ready. These emissions happen in the correct order. */ - boost::signals2::signal, dcpomatic::DCPTime)> Video; - boost::signals2::signal, dcpomatic::DCPTime, int)> 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, dcpomatic::DCPTimePeriod)> Text; - boost::signals2::signal, dcpomatic::DCPTime, AtmosMetadata)> Atmos; + boost::signals2::signal, dcpomatic::DCPTime, AtmosMetadata)> Atmos; private: friend class PlayerWrapper; @@ -126,31 +124,31 @@ private: 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, dcpomatic::ContentTime); - void atmos (boost::weak_ptr, ContentAtmos); + Frame dcp_to_content_video (std::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_video_to_dcp (std::shared_ptr piece, Frame f) const; + Frame dcp_to_resampled_audio (std::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime resampled_audio_to_dcp (std::shared_ptr piece, Frame f) const; + dcpomatic::ContentTime dcp_to_content_time (std::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_time_to_dcp (std::shared_ptr piece, dcpomatic::ContentTime t) const; + std::shared_ptr black_player_video_frame (Eyes eyes) const; + + void video (std::weak_ptr, ContentVideo); + void audio (std::weak_ptr, AudioStreamPtr, ContentAudio); + void bitmap_text_start (std::weak_ptr, std::weak_ptr, ContentBitmapText); + void plain_text_start (std::weak_ptr, std::weak_ptr, ContentStringText); + void subtitle_stop (std::weak_ptr, std::weak_ptr, dcpomatic::ContentTime); + void atmos (std::weak_ptr, ContentAtmos); 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 + std::pair, dcpomatic::DCPTime> discard_audio ( + std::shared_ptr audio, dcpomatic::DCPTime time, dcpomatic::DCPTime discard_to ) const; 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); - boost::shared_ptr playlist () const; + void emit_video (std::shared_ptr pv, dcpomatic::DCPTime time); + void do_emit_video (std::shared_ptr pv, dcpomatic::DCPTime time); + void emit_audio (std::shared_ptr data, dcpomatic::DCPTime time); + std::shared_ptr playlist () const; /** 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 @@ -158,19 +156,19 @@ private: */ mutable boost::mutex _mutex; - boost::shared_ptr _film; + std::shared_ptr _film; /** Playlist, or 0 if we are using the one from the _film */ - boost::shared_ptr _playlist; + std::shared_ptr _playlist; /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ boost::atomic _suspended; - std::list > _pieces; + std::list > _pieces; /** Size of the image we are rendering to; this may be the DCP frame size, or * the size of preview in a window. */ dcp::Size _video_container_size; - boost::shared_ptr _black_image; + std::shared_ptr _black_image; /** true if the player should ignore all video; i.e. never produce any */ bool _ignore_video; @@ -193,24 +191,24 @@ private: boost::optional _dcp_decode_reduction; - typedef std::map, boost::shared_ptr > LastVideoMap; + typedef std::map, std::shared_ptr, std::owner_less>> LastVideoMap; LastVideoMap _last_video; AudioMerger _audio_merger; Shuffler* _shuffler; - std::list, dcpomatic::DCPTime> > _delay; + std::list, dcpomatic::DCPTime> > _delay; class StreamState { public: StreamState () {} - StreamState (boost::shared_ptr p, dcpomatic::DCPTime l) + StreamState (std::shared_ptr p, dcpomatic::DCPTime l) : piece(p) , last_push_end(l) {} - boost::shared_ptr piece; + std::shared_ptr piece; dcpomatic::DCPTime last_push_end; }; std::map _stream_states; @@ -219,7 +217,7 @@ private: Empty _silent; ActiveText _active_texts[TEXT_COUNT]; - boost::shared_ptr _audio_processor; + std::shared_ptr _audio_processor; dcpomatic::DCPTime _playback_length;