diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /test/test.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'test/test.cc')
| -rw-r--r-- | test/test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |