Mostly-merge master.

[dcpomatic.git] / test / silence_padding_test.cc

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 0e0695c033b0b90af3f9d8ca92c12b5350c20883..e4472ad4fef042f52f4822e56f5b82b2290a2009 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -18,12 +18,12 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <libdcp/cpl.h>
-#include <libdcp/dcp.h>
-#include <libdcp/sound_mxf.h>
-#include <libdcp/sound_frame.h>
-#include <libdcp/reel.h>
-#include <libdcp/reel_sound_asset.h>
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <dcp/sound_mxf.h>
+#include <dcp/sound_frame.h>
+#include <dcp/reel.h>
+#include <dcp/reel_sound_asset.h>
 #include "lib/sndfile_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
@@ -58,7 +58,7 @@ static void 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 (sound_asset->mxf()->channels () == channels);
+       BOOST_CHECK_EQUAL (sound_asset->mxf()->channels (), channels);
 
        /* Sample index in the DCP */
        int n = 0;