diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-08-19 16:36:09 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-20 19:27:16 +0200 |
| commit | f9078ac398e0765e39f503cdc5bed406d45e0c36 (patch) | |
| tree | 1de45d4abb3f85c2be4c8faa07a1c7507cd682a3 /test | |
| parent | 98e49fbf5e7d815654c9187db19a91bd8e575336 (diff) | |
Stop using XMLMetadata in CPL. It's always felt a bit clumsy, and
with the CPL metadata extension having a method like set_metadata()
in CPL will be confusing.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_test.cc | 10 | ||||
| -rw-r--r-- | test/encryption_test.cc | 5 | ||||
| -rw-r--r-- | test/write_subtitle_test.cc | 5 |
3 files changed, 16 insertions, 4 deletions
diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 4ac924e0..30c5ca30 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -92,7 +92,10 @@ BOOST_AUTO_TEST_CASE (dcp_test2) shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_metadata (xml_meta); + cpl->set_issuer (xml_meta.issuer); + cpl->set_creator (xml_meta.creator); + cpl->set_issue_date (xml_meta.issue_date); + cpl->set_annotation_text (xml_meta.annotation_text); shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); mp->set_metadata (mxf_meta); @@ -193,7 +196,10 @@ BOOST_AUTO_TEST_CASE (dcp_test5) shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_metadata (xml_meta); + cpl->set_issuer (xml_meta.issuer); + cpl->set_creator (xml_meta.creator); + cpl->set_issue_date (xml_meta.issue_date); + cpl->set_annotation_text (xml_meta.annotation_text); shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE)); mp->set_metadata (mxf_meta); diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 2af80270..4b9e525e 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -133,7 +133,10 @@ BOOST_AUTO_TEST_CASE (encryption_test) ))); cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); - cpl->set_metadata (xml_metadata); + cpl->set_issuer (xml_metadata.issuer); + cpl->set_creator (xml_metadata.creator); + cpl->set_issue_date (xml_metadata.issue_date); + cpl->set_annotation_text (xml_metadata.annotation_text); d.add (cpl); diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc index dd51d919..266a1039 100644 --- a/test/write_subtitle_test.cc +++ b/test/write_subtitle_test.cc @@ -369,7 +369,10 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3) shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE)); cpl->add (reel); - cpl->set_metadata (xml_meta); + cpl->set_issuer (xml_meta.issuer); + cpl->set_creator (xml_meta.creator); + cpl->set_issue_date (xml_meta.issue_date); + cpl->set_annotation_text (xml_meta.annotation_text); cpl->set_content_version_label_text ("foo"); dcp::DCP dcp ("build/test/write_interop_subtitle_test3"); |