X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_test.cc;h=e9b0c70394b2ecf62d10f24284032b50f2f40fea;hb=3bc6a4ff1965c25f058f8d7a151c12a079b59f04;hp=067075d254a2650809c447a6639caf6f2d31cfa2;hpb=6cc7359c1af897f334dab5ba455707ce0c59af9d;p=dcpomatic.git diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc index 067075d25..e9b0c7039 100644 --- a/test/ffmpeg_audio_test.cc +++ b/test/ffmpeg_audio_test.cc @@ -53,8 +53,6 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) BOOST_REQUIRE (!wait_for_jobs()); - c->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); - film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); @@ -130,11 +128,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2) { shared_ptr film = new_test_film2 ("ffmpeg_audio_test2"); - shared_ptr content = content_factory(private_data / "wayne.mkv").front(); + shared_ptr content = content_factory(TestPaths::private_data / "wayne.mkv").front(); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr player (new Player (film, film->playlist ())); + shared_ptr player (new Player(film)); while (!player->pass ()) {} } @@ -142,11 +140,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2) BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3) { shared_ptr film = new_test_film2 ("ffmpeg_audio_test2"); - shared_ptr content = content_factory(private_data / "wayne.mkv").front(); + shared_ptr content = content_factory(TestPaths::private_data / "wayne.mkv").front(); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr player (new Player (film, film->playlist ())); + shared_ptr player (new Player(film)); player->set_fast (); while (!player->pass ()) {} }