Introduce dc::Package, changing lots of namespaces in the process.

1 files changed, 15 insertions, 15 deletions

diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 49e22520..48d67add 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -52,19 +52,19 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	boost::filesystem::path work_dir = "build/test/round_trip_test";
 	boost::filesystem::create_directory (work_dir);
 
-	shared_ptr<dcp::dc::MonoPictureAsset> asset_A (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1)));
-	shared_ptr<dcp::dc::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", dcp::dc::SMPTE, false);
-	dcp::dc::File j2c ("test/data/32x32_red_square.j2c");
+	shared_ptr<dcp::MonoPictureAsset> asset_A (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
+	shared_ptr<dcp::PictureAssetWriter> writer = asset_A->start_write (work_dir / "video.mxf", dcp::DCP_SMPTE, false);
+	dcp::File j2c ("test/data/32x32_red_square.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
 	}
 	writer->finalize ();
 
-	dcp::dc::Key key;
+	dcp::Key key;
 
 	asset_A->set_key (key);
 
-	shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::dc::FEATURE));
+	shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::FEATURE));
 	shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ());
 	reel->add (shared_ptr<dcp::dc::ReelMonoPictureAsset> (new dcp::dc::ReelMonoPictureAsset (asset_A, 0)));
 	cpl->add (reel);
@@ -73,8 +73,8 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	dcp::dc::DecryptedKDM kdm_A (
 		cpl,
 		key,
-		dcp::dc::LocalTime ("2013-01-01T00:00:00+00:00"),
-		dcp::dc::LocalTime ("2013-01-08T00:00:00+00:00"),
+		dcp::LocalTime ("2013-01-01T00:00:00+00:00"),
+		dcp::LocalTime ("2013-01-08T00:00:00+00:00"),
 		"libdcp",
 		"test",
 		"2012-07-17T04:45:18+00:00"
@@ -82,10 +82,10 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	boost::filesystem::path const kdm_file = work_dir / "kdm.xml";
 
-	kdm_A.encrypt(signer, signer->leaf(), vector<dcp::dc::Certificate>(), dcp::dc::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file);
+	kdm_A.encrypt(signer, signer->leaf(), vector<dcp::dc::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file);
 
 	/* Reload the KDM, using our private key to decrypt it */
-	dcp::dc::DecryptedKDM kdm_B (dcp::dc::EncryptedKDM (dcp::dc::file_to_string (kdm_file)), signer->key().get ());
+	dcp::dc::DecryptedKDM kdm_B (dcp::dc::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key().get ());
 
 	/* Check that the decrypted KDMKeys are the same as the ones we started with */
 	BOOST_CHECK_EQUAL (kdm_A.keys().size(), kdm_B.keys().size());
@@ -100,21 +100,21 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	}
 
 	/* Reload the picture asset */
-	shared_ptr<dcp::dc::MonoPictureAsset> asset_B (
-		new dcp::dc::MonoPictureAsset (work_dir / "video.mxf")
+	shared_ptr<dcp::MonoPictureAsset> asset_B (
+		new dcp::MonoPictureAsset (work_dir / "video.mxf")
 		);
 
 	BOOST_CHECK (!kdm_B.keys().empty ());
 	asset_B->set_key (kdm_B.keys().front().key());
 
-	shared_ptr<dcp::dc::OpenJPEGImage> xyz_A = asset_A->get_frame(0)->xyz_image ();
-	shared_ptr<dcp::dc::OpenJPEGImage> xyz_B = asset_B->get_frame(0)->xyz_image ();
+	shared_ptr<dcp::OpenJPEGImage> xyz_A = asset_A->get_frame(0)->xyz_image ();
+	shared_ptr<dcp::OpenJPEGImage> xyz_B = asset_B->get_frame(0)->xyz_image ();
 
 	scoped_array<uint8_t> frame_A (new uint8_t[xyz_A->size().width * xyz_A->size().height * 4]);
-	dcp::dc::xyz_to_rgba (xyz_A, dcp::dc::ColourConversion::srgb_to_xyz(), frame_A.get());
+	dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.get());
 
 	scoped_array<uint8_t> frame_B (new uint8_t[xyz_B->size().width * xyz_B->size().height * 4]);
-	dcp::dc::xyz_to_rgba (xyz_B, dcp::dc::ColourConversion::srgb_to_xyz(), frame_B.get());
+	dcp::xyz_to_rgba (xyz_B, dcp::ColourConversion::srgb_to_xyz(), frame_B.get());
 
 	BOOST_CHECK_EQUAL (xyz_A->size().width, xyz_B->size().width);
 	BOOST_CHECK_EQUAL (xyz_A->size().height, xyz_B->size().height);