diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 01:24:48 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 01:24:48 +0200 |
| commit | 13154bc1a9b341f46994607fdde2e725444a6e21 (patch) | |
| tree | 3fcf211b397092798b2aa39af4cc567d146a574c /tools | |
| parent | 9853cbf566fdfdea096333c4caa788c29fa5c57b (diff) | |
Remove String namespace from around compose().compose
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpinfo.cc | 12 |
1 files changed, 6 insertions, 6 deletions
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<string> const& only, string t) |