diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-29 23:19:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-01 17:27:02 +0100 |
| commit | c5b9ad09ab5eaf032b0816f619ab5d75254e8597 (patch) | |
| tree | 2d1cba3086b6448f454ecac9d1dd0875a12b5214 /test | |
| parent | f9fcc34179a6f86425427741c60d8876099d3ed3 (diff) | |
Go back to player having a playlist and not assuming it uses the film's content.
Diffstat (limited to 'test')
| -rw-r--r-- | test/audio_analysis_test.cc | 6 | ||||
| -rw-r--r-- | test/player_test.cc | 5 | ||||
| -rw-r--r-- | test/upmixer_a_test.cc | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index 94ad96a29..7cbe283fd 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test) film->examine_and_add_content (c); wait_for_jobs (); - shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film)); + shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ())); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); wait_for_jobs (); @@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test) film->examine_and_add_content (c); wait_for_jobs (); - shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film)); + shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ())); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); wait_for_jobs (); @@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2) film->examine_and_add_content (c); wait_for_jobs (); - shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film)); + shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ())); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); wait_for_jobs (); diff --git a/test/player_test.cc b/test/player_test.cc index 87e7fda8a..12e928a35 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -57,7 +57,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 (new Player (film)); + shared_ptr<Player> player (new Player (film, film->playlist ())); list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5)); BOOST_CHECK_EQUAL (o.size(), 1U); @@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test) film->examine_and_add_content (c); wait_for_jobs (); - shared_ptr<Player> player (new Player (film)); + shared_ptr<Player> player (new Player (film, film->playlist ())); 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 ()); @@ -103,4 +103,3 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test) } } } - diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc index 9bdcfd72e..5b7cff7d2 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 (new Player (film)); + shared_ptr<Player> player (new Player (film, film->playlist ())); 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()); |