From 13154bc1a9b341f46994607fdde2e725444a6e21 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 Jul 2021 01:24:48 +0200 Subject: Remove String namespace from around compose(). --- tools/dcpinfo.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 23a3ef15..f1777850 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -100,16 +100,16 @@ mbits_per_second (int size, Fraction frame_rate) return size * 8 * frame_rate.as_float() / 1e6; } -#define OUTPUT_DCP_PATH(...) maybe_output(only, "dcp-path", String::compose(__VA_ARGS__)); -#define OUTPUT_CPL_NAME_ID(...) maybe_output(only, "cpl-name-id", String::compose(__VA_ARGS__)); -#define OUTPUT_PICTURE(...) maybe_output(only, "picture", String::compose(__VA_ARGS__)); +#define OUTPUT_DCP_PATH(...) maybe_output(only, "dcp-path", compose(__VA_ARGS__)); +#define OUTPUT_CPL_NAME_ID(...) maybe_output(only, "cpl-name-id", compose(__VA_ARGS__)); +#define OUTPUT_PICTURE(...) maybe_output(only, "picture", compose(__VA_ARGS__)); #define OUTPUT_PICTURE_NC(x) maybe_output(only, "picture", (x)); #define SHOULD_PICTURE should_output(only, "picture") -#define OUTPUT_SOUND(...) maybe_output(only, "sound", String::compose(__VA_ARGS__)); +#define OUTPUT_SOUND(...) maybe_output(only, "sound", compose(__VA_ARGS__)); #define OUTPUT_SOUND_NC(x) maybe_output(only, "sound", (x)); -#define OUTPUT_SUBTITLE(...) maybe_output(only, "subtitle", String::compose(__VA_ARGS__)); +#define OUTPUT_SUBTITLE(...) maybe_output(only, "subtitle", compose(__VA_ARGS__)); #define OUTPUT_SUBTITLE_NC(x) maybe_output(only, "subtitle", (x)); -#define OUTPUT_TOTAL_TIME(...) maybe_output(only, "total-time", String::compose(__VA_ARGS__)); +#define OUTPUT_TOTAL_TIME(...) maybe_output(only, "total-time", compose(__VA_ARGS__)); static bool should_output(vector const& only, string t) -- cgit v1.2.3