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 /src/smpte_subtitle_asset.cc | |
| parent | 9853cbf566fdfdea096333c4caa788c29fa5c57b (diff) | |
Remove String namespace from around compose().compose
Diffstat (limited to 'src/smpte_subtitle_asset.cc')
| -rw-r--r-- | src/smpte_subtitle_asset.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index 19ef8b5b..8645c828 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -123,7 +123,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) } catch (cxml::Error& e) { boost::throw_exception ( ReadError ( - String::compose ( + compose( "Failed to read subtitle file %1; MXF failed with %2, XML failed with %3", file, static_cast<int>(r), e.what() ) @@ -138,11 +138,11 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) auto im = dynamic_pointer_cast<SubtitleImage>(i); if (im && im->png_image().size() == 0) { /* Even more dubious; allow <id>.png or urn:uuid:<id>.png */ - auto p = file.parent_path() / String::compose("%1.png", im->id()); + auto p = file.parent_path() / compose("%1.png", im->id()); if (boost::filesystem::is_regular_file(p)) { im->read_png_file (p); } else if (starts_with (im->id(), "urn:uuid:")) { - p = file.parent_path() / String::compose("%1.png", remove_urn_uuid(im->id())); + p = file.parent_path() / compose("%1.png", remove_urn_uuid(im->id())); if (boost::filesystem::is_regular_file(p)) { im->read_png_file (p); } @@ -303,7 +303,7 @@ SMPTESubtitleAsset::set_key (Key key) if (ASDCP_FAILURE (r)) { boost::throw_exception ( ReadError ( - String::compose ("Could not read encrypted subtitle MXF (%1)", static_cast<int> (r)) + compose("Could not read encrypted subtitle MXF (%1)", static_cast<int> (r)) ) ); } @@ -520,7 +520,7 @@ SMPTESubtitleAsset::equals (shared_ptr<const Asset> other_asset, EqualityOptions } if (_language != other->_language) { - note (NoteType::ERROR, String::compose("Subtitle languages differ (`%1' vs `%2')", _language.get_value_or("[none]"), other->_language.get_value_or("[none]"))); + note (NoteType::ERROR, compose("Subtitle languages differ (`%1' vs `%2')", _language.get_value_or("[none]"), other->_language.get_value_or("[none]"))); return false; } |