From 5b0e331380c83ec9835e8aa42fd342b2f0ad275d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 Jul 2021 02:02:19 +0200 Subject: Use dcp::compose rather than our own. --- src/lib/dkdm_wrapper.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/dkdm_wrapper.cc') diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc index 4698c159d..ceba6582c 100644 --- a/src/lib/dkdm_wrapper.cc +++ b/src/lib/dkdm_wrapper.cc @@ -19,10 +19,10 @@ */ -#include "compose.hpp" #include "dkdm_wrapper.h" #include "dcpomatic_assert.h" #include "warnings.h" +#include DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS @@ -57,7 +57,7 @@ DKDMBase::read (cxml::ConstNodePtr node) string DKDM::name () const { - return String::compose ("%1 (%2)", _dkdm.content_title_text(), _dkdm.cpl_id()); + return dcp::compose ("%1 (%2)", _dkdm.content_title_text(), _dkdm.cpl_id()); } -- cgit v1.2.3