From a193afb89de3e335612e07a3fbec3e4095f14f98 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 17 Jun 2015 16:08:43 +0100
Subject: Remove Film::make_player().

---
 src/lib/film.cc          | 6 ------
 src/lib/film.h           | 1 -
 src/lib/transcoder.cc    | 2 +-
 src/tools/server_test.cc | 2 +-
 src/wx/film_viewer.cc    | 2 +-
 5 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'src')

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 ();
-- 
cgit v1.2.3