summaryrefslogtreecommitdiff
path: root/test/mca_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'test/mca_test.cc')
-rw-r--r--test/mca_test.cc10
1 files changed, 5 insertions, 5 deletions
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<dcp::SoundAsset>(private_test / "data" / dcp::String::compose("51_sound_with_mca_%1.mxf", i));
+ auto sound_asset = make_shared<dcp::SoundAsset>(private_test / "data" / dcp::compose("51_sound_with_mca_%1.mxf", i));
auto reel_sound_asset = make_shared<dcp::ReelSoundAsset>(sound_asset, 0);
auto reel = make_shared<dcp::Reel>();
- 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<dcp::CertificateChain>());
+ cpl.write_xml (dcp::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i), shared_ptr<dcp::CertificateChain>());
- 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<string> ignore;
check_xml (