test/data updates.

[dcpomatic.git] / test / audio_delay_test.cc

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index 87e6071a08bdb7e8717ce9726ed6301e8846365a..05384873f850a46340a2de918fdb8f0cd226310f 100644 (file)
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -27,7 +27,7 @@
 #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"
@@ -43,9 +43,11 @@ 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_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);
 
@@ -73,11 +75,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 +89,7 @@ void test_audio_delay (int delay_in_ms)
                                delayed = 0;
                        }
 
-                       BOOST_CHECK_EQUAL (sample, delayed);
+                       BOOST_REQUIRE_EQUAL (sample, delayed);
                        ++n;
                }
        }