X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftorture_test.cc;h=8bd541ad232479addfb5cbc32873834acfa42231;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hp=b6079096da6ca3494fe7d0b4136cad43a17094cc;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/test/torture_test.cc b/test/torture_test.cc
index b6079096d..8bd541ad2 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -45,6 +45,7 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** Test start/end trim and positioning of some audio content */
 BOOST_AUTO_TEST_CASE (torture_test1)
@@ -58,32 +59,32 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 	/* Staircase at an offset of 2000 samples, trimmed both start and end, with a gain of 6dB */
 	shared_ptr<Content> staircase = content_factory("test/data/staircase.wav").front ();
 	film->examine_and_add_content (staircase);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	staircase->set_position (film, DCPTime::from_frames (2000, film->audio_frame_rate()));
 	staircase->set_trim_start (ContentTime::from_frames (12, 48000));
 	staircase->set_trim_end (ContentTime::from_frames (35, 48000));
-	staircase->audio->set_gain (20 * log10(2));
+	staircase->audio->set_gain (linear_to_db(6));
 
 	/* And again at an offset of 50000 samples, trimmed both start and end, with a gain of 6dB */
 	staircase = content_factory("test/data/staircase.wav").front ();
 	film->examine_and_add_content (staircase);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	staircase->set_position (film, DCPTime::from_frames(50000, film->audio_frame_rate()));
 	staircase->set_trim_start (ContentTime::from_frames (12, 48000));
 	staircase->set_trim_end (ContentTime::from_frames (35, 48000));
-	staircase->audio->set_gain (20 * log10(2));
+	staircase->audio->set_gain (linear_to_db(6));
 
 	/* 1s of red at 5s in */
 	shared_ptr<Content> red = content_factory("test/data/flat_red.png").front ();
 	film->examine_and_add_content (red);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	red->set_position (film, DCPTime::from_seconds(5));
 	red->video->set_length (24);
 
 	film->set_video_frame_rate (24);
 	film->write_metadata ();
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	dcp::DCP dcp ("build/test/torture_test1/" + film->dcp_name(false));
 	dcp.read ();