X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_only_test.cc;h=6fc9f9f2cda58f03a5beef38abaed9edc115589b;hb=59acc57304a545d0cad49ad204d32d3f84dbbfa2;hp=bbeef0b11d03d1cac1d2ed9929ada0593082d3e3;hpb=d557a34c5eb00549e152b28daba48ffec58936bf;p=dcpomatic.git

diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc
index bbeef0b11..6fc9f9f2c 100644
--- a/test/ffmpeg_audio_only_test.cc
+++ b/test/ffmpeg_audio_only_test.cc
@@ -72,14 +72,14 @@ test (boost::filesystem::path file)
 	shared_ptr<Film> film = new_test_film ("ffmpeg_audio_only_test");
 	film->set_name ("test_film");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-	shared_ptr<FFmpegContent> c (new FFmpegContent (film, file));
+	shared_ptr<FFmpegContent> c (new FFmpegContent(file));
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
 
 	/* See if can make a DCP without any errors */
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	BOOST_CHECK (!JobManager::instance()->errors());
 
 	/* Compare the audio data player reads with what libsndfile reads */
@@ -92,7 +92,7 @@ test (boost::filesystem::path file)
 	ref_buffer_size = info.samplerate * info.channels;
 	ref_buffer = new float[ref_buffer_size];
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film));
 
 	player->Audio.connect (bind (&audio, _1, info.channels));
 	while (!player->pass ()) {}
@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test1)
 	shared_ptr<dcp::SoundAssetReader> reader = asset.start_read ();
 	for (int i = 0; i < asset.intrinsic_duration(); ++i) {
 		shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i);
-		sf_count_t this_time = min (info.frames, 2000L);
+		sf_count_t this_time = min (info.frames, sf_count_t(2000));
 		sf_readf_short (ref, buffer, this_time);
 		for (int j = 0; j < this_time; ++j) {
 			BOOST_REQUIRE_EQUAL (frame->get(2, j) >> 8, buffer[j]);
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test2)
 	shared_ptr<dcp::SoundAssetReader> reader = asset.start_read ();
 	for (int i = 0; i < asset.intrinsic_duration(); ++i) {
 		shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i);
-		sf_count_t this_time = min (info.frames, 2000L);
+		sf_count_t this_time = min (info.frames, sf_count_t(2000));
 		sf_readf_int (ref, buffer, this_time);
 		for (int j = 0; j < this_time; ++j) {
 			int32_t s = frame->get(2, j);
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test3)
 	shared_ptr<dcp::SoundAssetReader> reader = asset.start_read ();
 	for (int i = 0; i < asset.intrinsic_duration(); ++i) {
 		shared_ptr<const dcp::SoundFrame> frame = reader->get_frame(i);
-		sf_count_t this_time = min (info.frames, 2000L);
+		sf_count_t this_time = min (info.frames, sf_count_t(2000));
 		sf_readf_int (ref, buffer, this_time);
 		for (int j = 0; j < this_time; ++j) {
 			int32_t s = frame->get(2, j);