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 /test/test.cc | |
| parent | 9853cbf566fdfdea096333c4caa788c29fa5c57b (diff) | |
Remove String namespace from around compose().compose
Diffstat (limited to 'test/test.cc')
| -rw-r--r-- | test/test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test.cc b/test/test.cc index e9561dbe..3ebc235d 100644 --- a/test/test.cc +++ b/test/test.cc @@ -233,7 +233,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check) if (ref_buffer[i] != check_buffer[i]) { BOOST_CHECK_MESSAGE ( false, - dcp::String::compose("File %1 differs from reference %2 at offset %3", check, ref, pos + i) + dcp::compose("File %1 differs from reference %2 at offset %3", check, ref, pos + i) ); break; } @@ -275,7 +275,7 @@ simple_picture (boost::filesystem::path path, string suffix, int frames) shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::Standard::SMPTE)); mp->set_metadata (mxf_meta); - shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (path / dcp::String::compose("video%1.mxf", suffix), false); + shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (path / dcp::compose("video%1.mxf", suffix), false); dcp::Size const size (1998, 1080); auto image = make_shared<dcp::OpenJPEGImage>(size); @@ -302,7 +302,7 @@ simple_sound (boost::filesystem::path path, string suffix, dcp::MXFMetadata mxf_ shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), sample_rate, channels, dcp::LanguageTag("en-US"), dcp::Standard::SMPTE)); ms->_language = language; ms->set_metadata (mxf_meta); - shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write (path / dcp::String::compose("audio%1.mxf", suffix)); + shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write (path / dcp::compose("audio%1.mxf", suffix)); int const samples_per_frame = sample_rate / 24; @@ -353,7 +353,7 @@ make_simple (boost::filesystem::path path, int reels, int frames, dcp::Standard cpl->set_version_number(1); for (int i = 0; i < reels; ++i) { - string suffix = reels == 1 ? "" : dcp::String::compose("%1", i); + string suffix = reels == 1 ? "" : dcp::compose("%1", i); shared_ptr<dcp::MonoPictureAsset> mp = simple_picture (path, suffix, frames); shared_ptr<dcp::SoundAsset> ms = simple_sound (path, suffix, mxf_meta, "en-US", frames); |