std::shared_ptr

1 files changed, 36 insertions, 38 deletions

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 <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/atomic.hpp>
 #include <list>
 
@@ -69,11 +67,11 @@ public:
 /** @class Player
  *  @brief A class which can play a Playlist.
  */
-class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable
+class Player : public std::enable_shared_from_this<Player>, public boost::noncopyable
 {
 public:
-	Player (boost::shared_ptr<const Film>);
-	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist);
+	Player (std::shared_ptr<const Film>);
+	Player (std::shared_ptr<const Film>, std::shared_ptr<const Playlist> playlist);
 	~Player ();
 
 	bool pass ();
@@ -95,18 +93,18 @@ public:
 	void set_play_referenced ();
 	void set_dcp_decode_reduction (boost::optional<int> reduction);
 
-	boost::optional<dcpomatic::DCPTime> content_time_to_dcp (boost::shared_ptr<Content> content, dcpomatic::ContentTime t);
+	boost::optional<dcpomatic::DCPTime> content_time_to_dcp (std::shared_ptr<Content> content, dcpomatic::ContentTime t);
 
 	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>, dcpomatic::DCPTime)> Video;
-	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime, int)> Audio;
+	boost::signals2::signal<void (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime)> Video;
+	boost::signals2::signal<void (std::shared_ptr<AudioBuffers>, dcpomatic::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, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod)> Text;
-	boost::signals2::signal<void (boost::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata)> Atmos;
+	boost::signals2::signal<void (std::shared_ptr<const dcp::AtmosFrame>, 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<const Piece> piece, dcpomatic::DCPTime t) const;
-	dcpomatic::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, dcpomatic::DCPTime t) const;
-	dcpomatic::DCPTime resampled_audio_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
-	dcpomatic::ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, dcpomatic::DCPTime t) const;
-	dcpomatic::DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, dcpomatic::ContentTime t) const;
-	boost::shared_ptr<PlayerVideo> black_player_video_frame (Eyes eyes) const;
-
-	void video (boost::weak_ptr<Piece>, ContentVideo);
-	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>, dcpomatic::ContentTime);
-	void atmos (boost::weak_ptr<Piece>, ContentAtmos);
+	Frame dcp_to_content_video (std::shared_ptr<const Piece> piece, dcpomatic::DCPTime t) const;
+	dcpomatic::DCPTime content_video_to_dcp (std::shared_ptr<const Piece> piece, Frame f) const;
+	Frame dcp_to_resampled_audio (std::shared_ptr<const Piece> piece, dcpomatic::DCPTime t) const;
+	dcpomatic::DCPTime resampled_audio_to_dcp (std::shared_ptr<const Piece> piece, Frame f) const;
+	dcpomatic::ContentTime dcp_to_content_time (std::shared_ptr<const Piece> piece, dcpomatic::DCPTime t) const;
+	dcpomatic::DCPTime content_time_to_dcp (std::shared_ptr<const Piece> piece, dcpomatic::ContentTime t) const;
+	std::shared_ptr<PlayerVideo> black_player_video_frame (Eyes eyes) const;
+
+	void video (std::weak_ptr<Piece>, ContentVideo);
+	void audio (std::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
+	void bitmap_text_start (std::weak_ptr<Piece>, std::weak_ptr<const TextContent>, ContentBitmapText);
+	void plain_text_start (std::weak_ptr<Piece>, std::weak_ptr<const TextContent>, ContentStringText);
+	void subtitle_stop (std::weak_ptr<Piece>, std::weak_ptr<const TextContent>, dcpomatic::ContentTime);
+	void atmos (std::weak_ptr<Piece>, ContentAtmos);
 
 	dcpomatic::DCPTime one_video_frame () const;
 	void fill_audio (dcpomatic::DCPTimePeriod period);
-	std::pair<boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime> discard_audio (
-		boost::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time, dcpomatic::DCPTime discard_to
+	std::pair<std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime> discard_audio (
+		std::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time, dcpomatic::DCPTime discard_to
 		) const;
 	boost::optional<PositionImage> open_subtitles_for_frame (dcpomatic::DCPTime time) const;
-	void emit_video (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
-	void do_emit_video (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
-	void emit_audio (boost::shared_ptr<AudioBuffers> data, dcpomatic::DCPTime time);
-	boost::shared_ptr<const Playlist> playlist () const;
+	void emit_video (std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
+	void do_emit_video (std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
+	void emit_audio (std::shared_ptr<AudioBuffers> data, dcpomatic::DCPTime time);
+	std::shared_ptr<const Playlist> 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<const Film> _film;
+	std::shared_ptr<const Film> _film;
 	/** Playlist, or 0 if we are using the one from the _film */
-	boost::shared_ptr<const Playlist> _playlist;
+	std::shared_ptr<const Playlist> _playlist;
 
 	/** > 0 if we are suspended (i.e. pass() and seek() do nothing) */
 	boost::atomic<int> _suspended;
-	std::list<boost::shared_ptr<Piece> > _pieces;
+	std::list<std::shared_ptr<Piece> > _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<Image> _black_image;
+	std::shared_ptr<Image> _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<int> _dcp_decode_reduction;
 
-	typedef std::map<boost::weak_ptr<Piece>, boost::shared_ptr<PlayerVideo> > LastVideoMap;
+	typedef std::map<std::weak_ptr<Piece>, std::shared_ptr<PlayerVideo>, std::owner_less<std::weak_ptr<Piece>>> LastVideoMap;
 	LastVideoMap _last_video;
 
 	AudioMerger _audio_merger;
 	Shuffler* _shuffler;
-	std::list<std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> > _delay;
+	std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> > _delay;
 
 	class StreamState
 	{
 	public:
 		StreamState () {}
 
-		StreamState (boost::shared_ptr<Piece> p, dcpomatic::DCPTime l)
+		StreamState (std::shared_ptr<Piece> p, dcpomatic::DCPTime l)
 			: piece(p)
 			, last_push_end(l)
 		{}
 
-		boost::shared_ptr<Piece> piece;
+		std::shared_ptr<Piece> piece;
 		dcpomatic::DCPTime last_push_end;
 	};
 	std::map<AudioStreamPtr, StreamState> _stream_states;
@@ -219,7 +217,7 @@ private:
 	Empty _silent;
 
 	ActiveText _active_texts[TEXT_COUNT];
-	boost::shared_ptr<AudioProcessor> _audio_processor;
+	std::shared_ptr<AudioProcessor> _audio_processor;
 
 	dcpomatic::DCPTime _playback_length;