Change video content scaling so that it either:

[dcpomatic.git] / test / ffmpeg_audio_test.cc

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 7a21ced06f14150840e2eba3325910c607fc9d60..e9b0c70394b2ecf62d10f24284032b50f2f40fea 100644 (file)
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -51,9 +51,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
        shared_ptr<FFmpegContent> c (new FFmpegContent ("test/data/staircase.mov"));
        film->examine_and_add_content (c);
 
-       wait_for_jobs ();
-
-       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+       BOOST_REQUIRE (!wait_for_jobs());
 
        film->set_container (Ratio::from_id ("185"));
        film->set_audio_channels (6);
@@ -61,7 +59,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
        film->make_dcp ();
        film->write_metadata ();
 
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        boost::filesystem::path path = "build/test";
        path /= "ffmpeg_audio_test";
@@ -130,11 +128,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 {
        shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
-       shared_ptr<Content> content = content_factory(private_data / "wayne.mkv").front();
+       shared_ptr<Content> content = content_factory(TestPaths::private_data / "wayne.mkv").front();
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       shared_ptr<Player> player (new Player (film, film->playlist ()));
+       shared_ptr<Player> 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> film = new_test_film2 ("ffmpeg_audio_test2");
-       shared_ptr<Content> content = content_factory(private_data / "wayne.mkv").front();
+       shared_ptr<Content> content = content_factory(TestPaths::private_data / "wayne.mkv").front();
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
 
-       shared_ptr<Player> player (new Player (film, film->playlist ()));
+       shared_ptr<Player> player (new Player(film));
        player->set_fast ();
        while (!player->pass ()) {}
 }