Remove Film::make_player().

diff --git a/src/lib/film.cc b/src/lib/film.cc
index d650fa3d38e2286e0403185fcd2b4374fc4473fa..a0caade8e58495dd23922ef8d8eb980eeaeb3c29 100644 (file)
--- 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 fb75504a2aecfbdaf0e368deee2b23e5226a12ee..ac25323b932cae277acb3e149b9f4c9108ca144b 100644 (file)
--- 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 8aed205741ec9aaf454ec70026a4b70d68bdaaba..091da50f445d92fbcd42079765a286059814cadd 100644 (file)
--- 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 aab92a698cc96595407aeb64ab001ce650cbb265..6f7a435690a8645b29a02ed7bbcdb9370248f29f 100644 (file)
--- 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 26d81ee86490653db9856603ea80949f7c17a377..1632a45bea3e7478cb045ba8dcb6a4d7b5eaf8e4 100644 (file)
--- 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 bbf70781a87d4600526428055228fc54809c1c62..dcf8e7f6dd323e264ecc5d8d1197f4956355ea77 100644 (file)
--- 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 aadde36363e0d4bef8f684c0a290d9ab44e76a2b..29b0b4d1f54cdbfb62334107a9181e02258129d5 100644 (file)
--- 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 1cd20e219dfadc728c15c3edbf3a3ad6bee565d3..9bdcfd72e408afbe342874c43ae9c6449e2b9ea1 100644 (file)
--- 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());