X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsilence_padding_test.cc;h=30f7e106e3494acd385790e8b681f3f13deca43b;hb=1ca0d61534209e4679cead26e0df1886704a3ef8;hp=ff369062662b6807fe45a56e57d5d4631c033d48;hpb=233bb3f790aef3c8f9a7a7fde9875833b7dc1dfb;p=dcpomatic.git

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index ff3690626..30f7e106e 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -24,7 +24,7 @@
 #include <boost/test/unit_test.hpp>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/sound_mxf.h>
+#include <dcp/sound_asset.h>
 #include <dcp/sound_frame.h>
 #include <dcp/reel.h>
 #include <dcp/reel_sound_asset.h>
@@ -43,7 +43,7 @@ test_silence_padding (int channels)
 {
 	string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
 	shared_ptr<Film> film = new_test_film (film_name);
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name (film_name);
 
@@ -63,51 +63,51 @@ test_silence_padding (int channels)
 
 	shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
 	BOOST_CHECK (sound_asset);
-	BOOST_CHECK_EQUAL (sound_asset->mxf()->channels (), channels);
+	BOOST_CHECK_EQUAL (sound_asset->asset()->channels (), channels);
 
 	/* Sample index in the DCP */
 	int n = 0;
 	/* DCP sound asset frame */
 	int frame = 0;
 
-	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())) {
 
-			if (sound_asset->mxf()->channels() > 0) {
+		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {
+
+			if (sound_asset->asset()->channels() > 0) {
 				/* L should be silent */
 				int const sample = d[i + 0] | (d[i + 1] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
 			}
 
-			if (sound_asset->mxf()->channels() > 1) {
+			if (sound_asset->asset()->channels() > 1) {
 				/* R should be silent */
 				int const sample = d[i + 2] | (d[i + 3] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
 			}
-			
-			if (sound_asset->mxf()->channels() > 2) {
+
+			if (sound_asset->asset()->channels() > 2) {
 				/* Mono input so it will appear on centre */
 				int const sample = d[i + 7] | (d[i + 8] << 8);
 				BOOST_CHECK_EQUAL (sample, n);
 			}
 
-			if (sound_asset->mxf()->channels() > 3) {
+			if (sound_asset->asset()->channels() > 3) {
 				/* Lfe should be silent */
 				int const sample = d[i + 9] | (d[i + 10] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
 			}
 
-			if (sound_asset->mxf()->channels() > 4) {
+			if (sound_asset->asset()->channels() > 4) {
 				/* Ls should be silent */
 				int const sample = d[i + 11] | (d[i + 12] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
 			}
 
 
-			if (sound_asset->mxf()->channels() > 5) {
+			if (sound_asset->asset()->channels() > 5) {
 				/* Rs should be silent */
 				int const sample = d[i + 13] | (d[i + 14] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
@@ -116,12 +116,12 @@ test_silence_padding (int channels)
 			++n;
 		}
 	}
-	
+
 }
 
 BOOST_AUTO_TEST_CASE (silence_padding_test)
 {
-	for (int i = 1; i < MAX_AUDIO_CHANNELS; ++i) {
+	for (int i = 1; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
 		test_silence_padding (i);
 	}
 }