Remove Film::make_player().

8 files changed, 7 insertions, 14 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index d650fa3d3..a0caade8e 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -895,12 +895,6 @@ Film::cpls () const
 	return out;
 }
 
-shared_ptr<Player>
-Film::make_player () const
-{
-	return shared_ptr<Player> (new Player (shared_from_this ()));
-}
-
 void
 Film::set_signed (bool s)
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index fb75504a2..ac25323b9 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -101,7 +101,6 @@ public:
 
 	std::vector<CPLSummary> cpls () const;
 
-	boost::shared_ptr<Player> make_player () const;
 	boost::shared_ptr<Playlist> playlist () const;
 
 	int audio_frame_rate () const;
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 8aed20574..091da50f4 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -48,7 +48,7 @@ using boost::dynamic_pointer_cast;
  */
 Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _film (f)
-	, _player (f->make_player ())
+	, _player (new Player (f))
 	, _writer (new Writer (f, j))
 	, _encoder (new Encoder (f, j, _writer))
 	, _finishing (false)
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index aab92a698..6f7a43569 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -142,7 +142,7 @@ main (int argc, char* argv[])
 		film.reset (new Film (film_dir));
 		film->read_metadata ();
 		
-		shared_ptr<Player> player = film->make_player ();
+		shared_ptr<Player> player (new Player (film));
 
 		DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ());
 		for (DCPTime t; t < film->length(); t += frame) {
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 26d81ee86..1632a45be 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -138,7 +138,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	}
 
 	try {
-		_player = f->make_player ();
+		_player.reset (new Player (f));
 	} catch (bad_alloc) {
 		error_dialog (this, _("There is not enough free memory to do that."));
 		_film.reset ();
diff --git a/test/play_test.cc b/test/play_test.cc
index bbf70781a..dcf8e7f6d 100644
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE (play_test)
 	/* A is 16 frames long at 25 fps */
 	BOOST_CHECK_EQUAL (B->position(), 16 * TIME_HZ / 25);
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player (new Player (film));
 	PlayerWrapper wrap (player);
 	/* Seek and audio don't get on at the moment */
 	player->disable_audio ();
diff --git a/test/player_test.cc b/test/player_test.cc
index aadde3636..29b0b4d1f 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
 	B->set_position (DCPTime::from_seconds (10));
 	C->set_position (DCPTime::from_seconds (20));
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player (new Player (film));
 
 	list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5));
 	BOOST_CHECK_EQUAL (o.size(), 1U);
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player (new Player (film));
 	shared_ptr<AudioBuffers> test = player->get_audio (DCPTime (0), DCPTime::from_seconds (1), true);
 	BOOST_CHECK_EQUAL (test->frames(), 48000);
 	BOOST_CHECK_EQUAL (test->channels(), film->audio_channels ());
diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 1cd20e219..9bdcfd72e 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
 	SNDFILE* Ls = sf_open ("build/test/upmixer_a_test/Ls.wav", SFM_WRITE, &info);
 	SNDFILE* Rs = sf_open ("build/test/upmixer_a_test/Rs.wav", SFM_WRITE, &info);
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player (new Player (film));
 	for (DCPTime t; t < film->length(); t += DCPTime::from_seconds (1)) {
 		shared_ptr<AudioBuffers> b = player->get_audio (t, DCPTime::from_seconds (1), true);
 		sf_write_float (L, b->data(0), b->frames());