X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_delay_test.cc;h=a455110b8f6f6ba4d62ab9db76d4aab238af4592;hb=c674598c4366d475b6356e2f56c112a36b0c472e;hp=68e14ff3ca353f470d9f09f8c14112f6713b34a4;hpb=4616b19fb5241a54c9d57f7a91bb975f41aed14b;p=dcpomatic.git

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index 68e14ff3c..a455110b8 100644
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -27,13 +27,14 @@
 #include <dcp/sound_frame.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
-#include <dcp/sound_mxf.h>
+#include <dcp/sound_asset.h>
 #include <dcp/reel_sound_asset.h>
 #include "lib/sndfile_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
 #include "lib/film.h"
 #include "test.h"
+#include <iostream>
 
 using std::string;
 using std::cout;
@@ -43,6 +44,8 @@ using boost::shared_ptr;
 static
 void test_audio_delay (int delay_in_ms)
 {
+	BOOST_TEST_MESSAGE ("Testing delay of " << delay_in_ms);
+
 	string const film_name = "audio_delay_test_" + lexical_cast<string> (delay_in_ms);
 	shared_ptr<Film> film = new_test_film (film_name);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
@@ -73,11 +76,11 @@ void test_audio_delay (int delay_in_ms)
 	/* Delay in frames */
 	int const delay_in_frames = delay_in_ms * 48000 / 1000;
 
-	while (n < sound_asset->mxf()->intrinsic_duration()) {
-		shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->mxf()->get_frame (frame++);
+	while (n < sound_asset->asset()->intrinsic_duration()) {
+		shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->get_frame (frame++);
 		uint8_t const * d = sound_frame->data ();
-		
-		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->mxf()->channels())) {
+
+		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {
 
 			/* Mono input so it will appear on centre */
 			int const sample = d[i + 7] | (d[i + 8] << 8);
@@ -87,7 +90,7 @@ void test_audio_delay (int delay_in_ms)
 				delayed = 0;
 			}
 
-			BOOST_CHECK_EQUAL (sample, delayed);
+			BOOST_REQUIRE_EQUAL (sample, delayed);
 			++n;
 		}
 	}