Put everything into dcp::dc and change DCP -> Package.

1 files changed, 24 insertions, 24 deletions

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 7c8256fa..045d22be 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -52,46 +52,46 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 
 	Kumu::libdcp_test = true;
 
-	dcp::MXFMetadata mxf_metadata;
+	dcp::dc::MXFMetadata mxf_metadata;
 	mxf_metadata.company_name = "OpenDCP";
 	mxf_metadata.product_name = "OpenDCP";
 	mxf_metadata.product_version = "0.0.25";
 
-	dcp::XMLMetadata xml_metadata;
+	dcp::dc::XMLMetadata xml_metadata;
 	xml_metadata.issuer = "OpenDCP 0.0.25";
 	xml_metadata.creator = "OpenDCP 0.0.25";
 	xml_metadata.issue_date = "2012-07-17T04:45:18+00:00";
 
 	boost::filesystem::remove_all ("build/test/DCP/encryption_test");
 	boost::filesystem::create_directories ("build/test/DCP/encryption_test");
-	dcp::DCP d ("build/test/DCP/encryption_test");
+	dcp::dc::Package d ("build/test/DCP/encryption_test");
 
 	/* Use test/ref/crypt so this test is repeatable */
-	shared_ptr<dcp::CertificateChain> signer (new dcp::CertificateChain ());
-	signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/ca.self-signed.pem")));
-	signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/intermediate.signed.pem")));
-	signer->add (dcp::Certificate (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem")));
-	signer->set_key (dcp::file_to_string ("test/ref/crypt/leaf.key"));
+	shared_ptr<dcp::dc::CertificateChain> signer (new dcp::dc::CertificateChain ());
+	signer->add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/ca.self-signed.pem")));
+	signer->add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/intermediate.signed.pem")));
+	signer->add (dcp::dc::Certificate (dcp::dc::file_to_string ("test/ref/crypt/leaf.signed.pem")));
+	signer->set_key (dcp::dc::file_to_string ("test/ref/crypt/leaf.key"));
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+	shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::dc::FEATURE));
 
-	dcp::Key key;
+	dcp::dc::Key key;
 
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
+	shared_ptr<dcp::dc::MonoPictureAsset> mp (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1)));
 	mp->set_metadata (mxf_metadata);
 	mp->set_key (key);
 
-	shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/DCP/encryption_test/video.mxf", dcp::SMPTE, false);
-	dcp::File j2c ("test/data/32x32_red_square.j2c");
+	shared_ptr<dcp::dc::PictureAssetWriter> writer = mp->start_write ("build/test/DCP/encryption_test/video.mxf", dcp::dc::SMPTE, false);
+	dcp::dc::File j2c ("test/data/32x32_red_square.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
 	}
 	writer->finalize ();
 
-	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1));
+	shared_ptr<dcp::dc::SoundAsset> ms (new dcp::dc::SoundAsset (dcp::dc::Fraction (24, 1), 48000, 1));
 	ms->set_metadata (mxf_metadata);
 	ms->set_key (key);
-	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf", dcp::SMPTE);
+	shared_ptr<dcp::dc::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf", dcp::dc::SMPTE);
 
 	SF_INFO info;
 	info.format = 0;
@@ -110,10 +110,10 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 
 	sound_writer->finalize ();
 
-	cpl->add (shared_ptr<dcp::Reel> (new dcp::Reel (
-						 shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)),
-						 shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)),
-						 shared_ptr<dcp::ReelSubtitleAsset> ()
+	cpl->add (shared_ptr<dcp::dc::Reel> (new dcp::dc::Reel (
+						 shared_ptr<dcp::dc::ReelMonoPictureAsset> (new dcp::dc::ReelMonoPictureAsset (mp, 0)),
+						 shared_ptr<dcp::dc::ReelSoundAsset> (new dcp::dc::ReelSoundAsset (ms, 0)),
+						 shared_ptr<dcp::dc::ReelSubtitleAsset> ()
 						 )));
 	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");
@@ -121,19 +121,19 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 
 	d.add (cpl);
 
-	d.write_xml (dcp::SMPTE, xml_metadata, signer);
+	d.write_xml (dcp::dc::SMPTE, xml_metadata, signer);
 
-	dcp::DecryptedKDM kdm (
+	dcp::dc::DecryptedKDM kdm (
 		cpl,
 		key,
-		dcp::LocalTime ("2013-01-01T00:00:00+00:00"),
-		dcp::LocalTime ("2017-01-08T00:00:00+00:00"),
+		dcp::dc::LocalTime ("2013-01-01T00:00:00+00:00"),
+		dcp::dc::LocalTime ("2017-01-08T00:00:00+00:00"),
 		"libdcp",
 		"test",
 		"2012-07-17T04:45:18+00:00"
 		);
 
-	kdm.encrypt (signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1).as_xml ("build/test/encryption_test.kdm.xml");
+	kdm.encrypt (signer, signer->leaf(), vector<dcp::dc::Certificate>(), dcp::dc::MODIFIED_TRANSITIONAL_1).as_xml ("build/test/encryption_test.kdm.xml");
 
 	int r = system (
 		"xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/encryption_test.kdm.xml "