X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_delay_test.cc;h=8e1d820859fa458838acc144bf6970ed6098331b;hb=47e29203daec51d313ed8ab8ef759752bce18d45;hp=b46cfeb2ca606dfeece78715c11bbd1446e688d8;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index b46cfeb2c..8e1d82085 100644
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -18,8 +18,11 @@
 
 */
 
+/** @defgroup specific Tests of fairly specific areas */
+
 /** @file  test/audio_delay_test.cc
  *  @brief Test encode using some FFmpegContents which have audio delays.
+ *  @ingroup specific
  *
  *  The output is checked algorithmically using knowledge of the input.
  */
@@ -29,6 +32,7 @@
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/sound_asset.h>
+#include <dcp/sound_asset_reader.h>
 #include <dcp/reel_sound_asset.h>
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
@@ -54,17 +58,18 @@ void test_audio_delay (int delay_in_ms)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name (film_name);
 
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/staircase.wav"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	content->audio->set_delay (delay_in_ms);
 
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path path = "build/test";
 	path /= film_name;
 	path /= film->dcp_name ();
+	std::cout << "Loading " << path.string() << "\n";
 	dcp::DCP check (path.string ());
 	check.read ();
 
@@ -79,7 +84,7 @@ void test_audio_delay (int delay_in_ms)
 	int const delay_in_frames = delay_in_ms * 48000 / 1000;
 
 	while (n < sound_asset->asset()->intrinsic_duration()) {
-		shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->get_frame (frame++);
+		shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->start_read()->get_frame (frame++);
 		uint8_t const * d = sound_frame->data ();
 
 		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {