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 /src/lib/dkdm_wrapper.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/dkdm_wrapper.cc')
| -rw-r--r-- | src/lib/dkdm_wrapper.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 <dcp/compose.h> DCPOMATIC_DISABLE_WARNINGS #include <libxml++/libxml++.h> 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()); } |