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/types.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/types.cc')
| -rw-r--r-- | src/lib/types.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/types.cc b/src/lib/types.cc index 228ebf28f..9e8748159 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -19,10 +19,10 @@ */ #include "types.h" -#include "compose.hpp" #include "dcpomatic_assert.h" #include "warnings.h" #include <dcp/raw_convert.h> +#include <dcp/compose.h> #include <dcp/cpl.h> #include <dcp/dcp.h> #include <dcp/reel_file_asset.h> @@ -112,7 +112,7 @@ string_to_text_type (string s) } else if (s == "closed-caption") { return TextType::CLOSED_CAPTION; } else { - throw MetadataError (String::compose ("Unknown text type %1", s)); + throw MetadataError (dcp::compose ("Unknown text type %1", s)); } } |