diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-21 01:57:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-21 01:57:06 +0100 |
| commit | 76e3325a16cdf6d7220a61e2b5cfdb9c804cc32c (patch) | |
| tree | 8c1b5e5dc2cec265469a0d8018b6d7396b089432 /test/mca_test.cc | |
| parent | 6c3db78c3d20ef064fa2a0ef38e65ca1ae69adb3 (diff) | |
Use enum class for the things in types.h
Diffstat (limited to 'test/mca_test.cc')
| -rw-r--r-- | test/mca_test.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/mca_test.cc b/test/mca_test.cc index faff3439..8467b49a 100644 --- a/test/mca_test.cc +++ b/test/mca_test.cc @@ -62,13 +62,13 @@ BOOST_AUTO_TEST_CASE (parse_mca_descriptors_from_mxf_test) reel->add (black_picture_asset(dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1", i), 24)); reel->add (reel_sound_asset); - dcp::CPL cpl("", dcp::FEATURE); + dcp::CPL cpl("", dcp::ContentKind::FEATURE); cpl.add (reel); cpl.set_main_sound_configuration("51/L,R,C,LFE,Ls,Rs"); 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), dcp::SMPTE, shared_ptr<dcp::CertificateChain>()); + cpl.write_xml (dcp::String::compose("build/test/parse_mca_descriptors_from_mxf_test%1/cpl.xml", i), dcp::Standard::SMPTE, 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)); @@ -91,14 +91,14 @@ BOOST_AUTO_TEST_CASE (parse_mca_descriptors_from_mxf_test) /** Reproduce the MCA tags from one of the example files using libdcp */ BOOST_AUTO_TEST_CASE (write_mca_descriptors_to_mxf_test) { - shared_ptr<dcp::SoundAsset> sound_asset(new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 6, dcp::LanguageTag("en-US"), dcp::SMPTE)); + shared_ptr<dcp::SoundAsset> sound_asset(new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 6, dcp::LanguageTag("en-US"), dcp::Standard::SMPTE)); vector<dcp::Channel> channels; - channels.push_back (dcp::LEFT); - channels.push_back (dcp::RIGHT); - channels.push_back (dcp::CENTRE); - channels.push_back (dcp::LFE); - channels.push_back (dcp::LS); - channels.push_back (dcp::RS); + channels.push_back (dcp::Channel::LEFT); + channels.push_back (dcp::Channel::RIGHT); + channels.push_back (dcp::Channel::CENTRE); + channels.push_back (dcp::Channel::LFE); + channels.push_back (dcp::Channel::LS); + channels.push_back (dcp::Channel::RS); shared_ptr<dcp::SoundAssetWriter> writer = sound_asset->start_write("build/test/write_mca_descriptors_to_mxf_test.mxf", channels); float* samples[6]; @@ -122,13 +122,13 @@ BOOST_AUTO_TEST_CASE (write_mca_descriptors_to_mxf_test) reel->add (black_picture_asset("build/test/write_mca_descriptors_to_mxf_test", 24)); reel->add (reel_sound_asset); - dcp::CPL cpl("", dcp::FEATURE); + dcp::CPL cpl("", dcp::ContentKind::FEATURE); cpl.add (reel); cpl.set_main_sound_configuration("51/L,R,C,LFE,Ls,Rs"); 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 ("build/test/write_mca_descriptors_to_mxf_test/cpl.xml", dcp::SMPTE, shared_ptr<dcp::CertificateChain>()); + cpl.write_xml ("build/test/write_mca_descriptors_to_mxf_test/cpl.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>()); cxml::Document ref("CompositionPlaylist", private_test / "51_sound_with_mca_1.cpl"); cxml::Document check("CompositionPlaylist", "build/test/write_mca_descriptors_to_mxf_test/cpl.xml"); |