diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-23 16:30:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-12-23 17:35:02 +0100 |
| commit | 52d807654169d6443909c1d5dd20a155801faa26 (patch) | |
| tree | 727774d21ea1f4b54ccd61a09127894cb8d572ef /src/reel_asset.cc | |
| parent | a6ccc587277b848b4a60c07456b11eb1b076d181 (diff) | |
Remove String::compose and use fmt instead.
Diffstat (limited to 'src/reel_asset.cc')
| -rw-r--r-- | src/reel_asset.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/reel_asset.cc b/src/reel_asset.cc index 46812e49..9e52dfaa 100644 --- a/src/reel_asset.cc +++ b/src/reel_asset.cc @@ -38,7 +38,6 @@ #include "asset.h" -#include "compose.hpp" #include "dcp_assert.h" #include "equality_options.h" #include "reel_asset.h" @@ -47,7 +46,7 @@ LIBDCP_DISABLE_WARNINGS #include <libxml++/libxml++.h> LIBDCP_ENABLE_WARNINGS -#include <fmt/core.h> +#include <fmt/format.h> using std::make_pair; @@ -141,7 +140,7 @@ ReelAsset::asset_equals(shared_ptr<const ReelAsset> other, EqualityOptions const auto const node = cpl_node_name(); if (_annotation_text != other->_annotation_text) { - string const s = String::compose("Reel %1: annotation texts differ (%2 vs %3)", node, optional_to_string(_annotation_text), optional_to_string(other->_annotation_text)); + string const s = fmt::format("Reel {}: annotation texts differ ({} vs {})", node, optional_to_string(_annotation_text), optional_to_string(other->_annotation_text)); if (!opt.reel_annotation_texts_can_differ) { note (NoteType::ERROR, s); return false; @@ -153,7 +152,7 @@ ReelAsset::asset_equals(shared_ptr<const ReelAsset> other, EqualityOptions const if (_edit_rate != other->_edit_rate) { note ( NoteType::ERROR, - String::compose("Reel %1: edit rates differ (%2 vs %3)", node, _edit_rate.as_string(), other->_edit_rate.as_string()) + fmt::format("Reel {}: edit rates differ ({} vs {})", node, _edit_rate.as_string(), other->_edit_rate.as_string()) ); return false; } @@ -161,7 +160,7 @@ ReelAsset::asset_equals(shared_ptr<const ReelAsset> other, EqualityOptions const if (_intrinsic_duration != other->_intrinsic_duration) { note ( NoteType::ERROR, - String::compose("Reel %1: intrinsic durations differ (%2 vs %3)", node, _intrinsic_duration, other->_intrinsic_duration) + fmt::format("Reel {}: intrinsic durations differ ({} vs {})", node, _intrinsic_duration, other->_intrinsic_duration) ); return false; } @@ -169,7 +168,7 @@ ReelAsset::asset_equals(shared_ptr<const ReelAsset> other, EqualityOptions const if (_entry_point != other->_entry_point) { note ( NoteType::ERROR, - String::compose("Reel %1: entry points differ (%2 vs %3)", node, optional_to_string(_entry_point), optional_to_string(other->_entry_point)) + fmt::format("Reel {}: entry points differ ({} vs {})", node, optional_to_string(_entry_point), optional_to_string(other->_entry_point)) ); return false; } @@ -177,7 +176,7 @@ ReelAsset::asset_equals(shared_ptr<const ReelAsset> other, EqualityOptions const if (_duration != other->_duration) { note ( NoteType::ERROR, - String::compose("Reel %1: durations differ (%2 vs %3)", node, optional_to_string(_duration), optional_to_string(other->_duration)) + fmt::format("Reel {}: durations differ ({} vs {})", node, optional_to_string(_duration), optional_to_string(other->_duration)) ); return false; } |