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

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index b46cfeb2c..d8d69424b 100644
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,30 +18,39 @@
 
 */
 
+
+/** @defgroup feature Tests of features */
+
 /** @file  test/audio_delay_test.cc
  *  @brief Test encode using some FFmpegContents which have audio delays.
+ *  @ingroup feature
  *
  *  The output is checked algorithmically using knowledge of the input.
  */
 
-#include <boost/test/unit_test.hpp>
-#include <dcp/sound_frame.h>
-#include <dcp/cpl.h>
-#include <dcp/reel.h>
-#include <dcp/sound_asset.h>
-#include <dcp/reel_sound_asset.h>
-#include "lib/ffmpeg_content.h"
+
+#include "lib/audio_content.h"
 #include "lib/dcp_content_type.h"
-#include "lib/ratio.h"
+#include "lib/ffmpeg_content.h"
 #include "lib/film.h"
-#include "lib/audio_content.h"
+#include "lib/ratio.h"
 #include "test.h"
+#include <dcp/cpl.h>
+#include <dcp/reel.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/sound_asset.h>
+#include <dcp/sound_asset_reader.h>
+#include <dcp/sound_frame.h>
+#include <boost/test/unit_test.hpp>
 #include <iostream>
 
-using std::string;
+
 using std::cout;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using boost::lexical_cast;
-using boost::shared_ptr;
+
 
 static
 void test_audio_delay (int delay_in_ms)
@@ -49,26 +58,23 @@ 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"));
-	film->set_container (Ratio::from_id ("185"));
-	film->set_name (film_name);
-
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/staircase.wav"));
-	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	auto content = make_shared<FFmpegContent>("test/data/staircase.wav");
+	shared_ptr<Film> film = new_test_film2 (
+		film_name, { content }
+		);
+
 	content->audio->set_delay (delay_in_ms);
 
-	film->make_dcp ();
-	wait_for_jobs ();
+	make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
 
 	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 ();
 
-	shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
+	auto sound_asset = check.cpls().front()->reels().front()->main_sound ();
 	BOOST_CHECK (sound_asset);
 
 	/* Sample index in the DCP */
@@ -79,7 +85,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())) {
@@ -98,6 +104,7 @@ void test_audio_delay (int delay_in_ms)
 	}
 }
 
+
 /* Test audio delay when specified in a piece of audio content */
 BOOST_AUTO_TEST_CASE (audio_delay_test)
 {