From 5b0e331380c83ec9835e8aa42fd342b2f0ad275d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 10 Jul 2021 02:02:19 +0200
Subject: Use dcp::compose rather than our own.

---
 test/test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/test.cc')

diff --git a/test/test.cc b/test/test.cc
index 4dab0cff1..7720fa3b7 100644
--- 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);
 }
 
-- 
cgit v1.2.3