diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-17 16:08:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-17 16:08:43 +0100 |
| commit | a193afb89de3e335612e07a3fbec3e4095f14f98 (patch) | |
| tree | d794f6f94dfe5506086729fe5ccd55e4f782bfa9 /test | |
| parent | c13757391e75cdde7a9cef947c921b7a9ad08003 (diff) | |
Remove Film::make_player().
Diffstat (limited to 'test')
| -rw-r--r-- | test/play_test.cc | 2 | ||||
| -rw-r--r-- | test/player_test.cc | 4 | ||||
| -rw-r--r-- | test/upmixer_a_test.cc | 2 |
3 files changed, 4 insertions, 4 deletions
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()); |