Use dcp::compose rather than our own.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 4dab0cff1b5895c0e197e19c0db140092662757e..7720fa3b7ca4e70f97eb9bd44916dd2baa3cda84 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -25,7 +25,6 @@
  */
 
 
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/cross.h"
 #include "lib/dcp_content_type.h"
@@ -42,6 +41,7 @@
 #include "lib/signal_manager.h"
 #include "lib/util.h"
 #include "test.h"
+#include <dcp/compose.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/mono_picture_asset.h>
@@ -754,7 +754,7 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 void
 check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check, int audio_tolerance)
 {
-       int const r = system (String::compose("ffcmp -t %1 %2 %3", audio_tolerance, ref.string(), check.string()).c_str());
+       int const r = system (dcp::compose("ffcmp -t %1 %2 %3", audio_tolerance, ref.string(), check.string()).c_str());
        BOOST_REQUIRE_EQUAL (WEXITSTATUS(r), 0);
 }