X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=f8a4e85a81126b98ed5835b8a3fbcd9f839c06a7;hb=93f6d36a4ced8521e0af92de33d77350bc0637b1;hp=41d92bc2f9aa9b6e9f699d17ee131177eaa678a9;hpb=fcab3e1bf6c6f05ca714eb9e337ff50f13fff6a6;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 41d92bc2f..f8a4e85a8 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -40,9 +40,9 @@ BOOST_AUTO_TEST_CASE (threed_test1)
 {
 	shared_ptr<Film> film = new_test_film ("threed_test1");
 	film->set_name ("test_film1");
-	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
 	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
@@ -63,9 +63,9 @@ BOOST_AUTO_TEST_CASE (threed_test2)
 {
 	shared_ptr<Film> film = new_test_film ("threed_test2");
 	film->set_name ("test_film2");
-	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
 	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
@@ -85,11 +85,11 @@ BOOST_AUTO_TEST_CASE (threed_test2)
 BOOST_AUTO_TEST_CASE (threed_test3)
 {
 	shared_ptr<Film> film = new_test_film2 ("threed_test3");
-	shared_ptr<FFmpegContent> L (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> L (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent (film, "test/data/test.mp4"));
+	shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/test.mp4"));
 	film->examine_and_add_content (R);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
 	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
@@ -104,11 +104,11 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
 	shared_ptr<Film> film = new_test_film2 ("threed_test4");
-	shared_ptr<FFmpegContent> L (new FFmpegContent (film, private_data / "LEFT_TEST_DCP3D4K.mov"));
+	shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "LEFT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent (film, private_data / "RIGHT_TEST_DCP3D4K.mov"));
+	shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (R);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
 	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
@@ -123,11 +123,11 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
 	shared_ptr<Film> film = new_test_film2 ("threed_test5");
-	shared_ptr<FFmpegContent> L (new FFmpegContent (film, private_data / "boon_telly.mkv"));
+	shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "boon_telly.mkv"));
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent (film, private_data / "boon_telly.mkv"));
+	shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
 	film->examine_and_add_content (R);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
 	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);