Fix it up a bit.

5 files changed, 20 insertions, 16 deletions

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 3197ace34..63ca36798 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -86,7 +86,7 @@ private:
 	typedef std::map<AudioStreamPtr, std::shared_ptr<Resampler>> ResamplerMap;
 	ResamplerMap _resamplers;
 
-	boost::shared_ptr<ResamplerManager> _resampler_manager;
+	std::shared_ptr<ResamplerManager> _resampler_manager;
 
 	bool _fast;
 };
diff --git a/src/lib/player.h b/src/lib/player.h
index f1316d128..a5ca549b1 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -232,7 +232,7 @@ private:
 
 	dcpomatic::DCPTime _playback_length;
 
-	boost::shared_ptr<ResamplerManager> _resampler_manager;
+	std::shared_ptr<ResamplerManager> _resampler_manager;
 
 	boost::signals2::scoped_connection _film_changed_connection;
 	boost::signals2::scoped_connection _playlist_change_connection;
diff --git a/src/lib/resampler_manager.cc b/src/lib/resampler_manager.cc
index aa98d0baa..4b736aa84 100644
--- a/src/lib/resampler_manager.cc
+++ b/src/lib/resampler_manager.cc
@@ -8,7 +8,7 @@
 
 
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 
diff --git a/src/lib/resampler_manager.h b/src/lib/resampler_manager.h
index 25c0a5e9e..ae470d537 100644
--- a/src/lib/resampler_manager.h
+++ b/src/lib/resampler_manager.h
@@ -12,15 +12,18 @@ class AudioStream;
 class Resampler;
 
 
-class ResamplerManager : public boost::noncopyable
+class ResamplerManager
 {
 public:
-	ResamplerManager (boost::weak_ptr<const Film> film)
+	ResamplerManager (std::weak_ptr<const Film> film)
 		: _film (film)
 	{}
 
-	void add (dcpomatic::DCPTime start, dcpomatic::DCPTime end, boost::shared_ptr<AudioContent> content, boost::shared_ptr<AudioDecoder> decoder);
-	boost::shared_ptr<Resampler> get (AudioDecoder* decoder, AudioStreamPtr stream, bool fast);
+	ResamplerManager (ResamplerManager const&) = delete;
+	ResamplerManager& operator= (ResamplerManager const&) = delete;
+
+	void add (dcpomatic::DCPTime start, dcpomatic::DCPTime end, std::shared_ptr<AudioContent> content, std::shared_ptr<AudioDecoder> decoder);
+	std::shared_ptr<Resampler> get (AudioDecoder* decoder, AudioStreamPtr stream, bool fast);
 
 private:
 	friend struct resampler_manager_setup_test;
@@ -28,7 +31,7 @@ private:
 	class Group
 	{
 	public:
-		Group (dcpomatic::DCPTime start_, dcpomatic::DCPTime end_, boost::shared_ptr<AudioContent> content, boost::shared_ptr<AudioDecoder> decoder)
+		Group (dcpomatic::DCPTime start_, dcpomatic::DCPTime end_, std::shared_ptr<AudioContent> content, std::shared_ptr<AudioDecoder> decoder)
 			: start(start_)
 			, end(end_)
 		{
@@ -39,16 +42,16 @@ private:
 
 		dcpomatic::DCPTime start;
 		dcpomatic::DCPTime end;
-		std::vector<boost::shared_ptr<AudioContent> > contents;
-		std::vector<boost::shared_ptr<AudioDecoder> > decoders;
-		std::vector<boost::shared_ptr<Resampler> > resamplers;
+		std::vector<std::shared_ptr<AudioContent>> contents;
+		std::vector<std::shared_ptr<AudioDecoder>> decoders;
+		std::vector<std::shared_ptr<Resampler>> resamplers;
 	};
 
 	bool can_share (Group const& a, Group const& b) const;
 	void coalesce ();
 	bool coalesce_pass ();
 
-	boost::weak_ptr<const Film> _film;
+	std::weak_ptr<const Film> _film;
 	std::vector<Group> _groups;
 };
 
diff --git a/test/resampler_manager_test.cc b/test/resampler_manager_test.cc
index 7efe0fffc..1f19b4293 100644
--- a/test/resampler_manager_test.cc
+++ b/test/resampler_manager_test.cc
@@ -5,7 +5,8 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
 using namespace dcpomatic;
 
 
@@ -22,12 +23,12 @@ get_some_content (shared_ptr<Film> film)
 
 BOOST_AUTO_TEST_CASE (resampler_manager_setup_test)
 {
-	shared_ptr<Film> film = new_test_film2 ("resampler_manager_setup_test");
+	auto film = new_test_film2 ("resampler_manager_setup_test");
 
 	/* One thing */
-	shared_ptr<Content> ac = get_some_content (film);
+	auto ac = get_some_content (film);
 	ac->set_position(film, DCPTime::from_seconds(5));
-	shared_ptr<Player> player (new Player(film, film->playlist()));
+	auto player = make_shared<Player>(film, film->playlist());
 	shared_ptr<ResamplerManager> rm = player->_resampler_manager;
 	BOOST_CHECK_EQUAL (rm->_groups.size(), 1);