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(). --- test/mca_test.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/mca_test.cc') diff --git a/test/mca_test.cc b/test/mca_test.cc index 3888e2b7..1201eca3 100644 --- a/test/mca_test.cc +++ b/test/mca_test.cc @@ -60,10 +60,10 @@ using std::vector; BOOST_AUTO_TEST_CASE (parse_mca_descriptors_from_mxf_test) { for (int i = 1; i < 3; ++i) { - auto sound_asset = make_shared(private_test / "data" / dcp::String::compose("51_sound_with_mca_%1.mxf", i)); + auto sound_asset = make_shared(private_test / "data" / dcp::compose("51_sound_with_mca_%1.mxf", i)); auto reel_sound_asset = make_shared(sound_asset, 0); auto reel = make_shared(); - reel->add (black_picture_asset(dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1", i), 24)); + reel->add (black_picture_asset(dcp::compose("build/test/parse_mca_descriptors_from_mxf_test%1", i), 24)); reel->add (reel_sound_asset); dcp::CPL cpl("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE); @@ -72,10 +72,10 @@ BOOST_AUTO_TEST_CASE (parse_mca_descriptors_from_mxf_test) cpl.set_main_sound_sample_rate(48000); cpl.set_main_picture_stored_area(dcp::Size(1998, 1080)); cpl.set_main_picture_active_area(dcp::Size(1998, 1080)); - cpl.write_xml (dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i), shared_ptr()); + cpl.write_xml (dcp::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i), shared_ptr()); - cxml::Document ref("CompositionPlaylist", private_test / dcp::String::compose("51_sound_with_mca_%1.cpl", i)); - cxml::Document check("CompositionPlaylist", dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i)); + cxml::Document ref("CompositionPlaylist", private_test / dcp::compose("51_sound_with_mca_%1.cpl", i)); + cxml::Document check("CompositionPlaylist", dcp::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i)); vector ignore; check_xml ( -- cgit v1.2.3