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

1 files changed, 37 insertions, 37 deletions

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 4a6cb429..6c5af703 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -44,11 +44,11 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 	Kumu::libdcp_test = true;
 
 	/* Some known metadata */
-	dcp::XMLMetadata xml_meta;
+	dcp::dc::XMLMetadata xml_meta;
 	xml_meta.issuer = "OpenDCP 0.0.25";
 	xml_meta.creator = "OpenDCP 0.0.25";
 	xml_meta.issue_date = "2012-07-17T04:45:18+00:00";
-	dcp::MXFMetadata mxf_meta;
+	dcp::dc::MXFMetadata mxf_meta;
 	mxf_meta.company_name = "OpenDCP";
 	mxf_meta.product_name = "OpenDCP";
 	mxf_meta.product_version = "0.0.25";
@@ -56,24 +56,24 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 	/* We're making build/test/DCP/dcp_test1 */
 	boost::filesystem::remove_all ("build/test/DCP/dcp_test1");
 	boost::filesystem::create_directories ("build/test/DCP/dcp_test1");
-	dcp::DCP d ("build/test/DCP/dcp_test1");
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+	dcp::dc::Package d ("build/test/DCP/dcp_test1");
+	shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::dc::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);
 
-	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_meta);
-	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::SMPTE, false);
-	dcp::File j2c ("test/data/32x32_red_square.j2c");
+	shared_ptr<dcp::dc::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::dc::SMPTE, false);
+	dcp::dc::File j2c ("test/data/32x32_red_square.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write (j2c.data (), j2c.size ());
 	}
 	picture_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_meta);
-	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::SMPTE);
+	shared_ptr<dcp::dc::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::dc::SMPTE);
 
 	SF_INFO info;
 	info.format = 0;
@@ -92,17 +92,17 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 
 	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> ()
 				  )
 			  ));
 
 	d.add (cpl);
 
-	d.write_xml (dcp::SMPTE, xml_meta);
+	d.write_xml (dcp::dc::SMPTE, xml_meta);
 
 	/* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run-tests.sh */
 }
@@ -113,11 +113,11 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 	Kumu::libdcp_test = true;
 
 	/* Some known metadata */
-	dcp::XMLMetadata xml_meta;
+	dcp::dc::XMLMetadata xml_meta;
 	xml_meta.issuer = "OpenDCP 0.0.25";
 	xml_meta.creator = "OpenDCP 0.0.25";
 	xml_meta.issue_date = "2012-07-17T04:45:18+00:00";
-	dcp::MXFMetadata mxf_meta;
+	dcp::dc::MXFMetadata mxf_meta;
 	mxf_meta.company_name = "OpenDCP";
 	mxf_meta.product_name = "OpenDCP";
 	mxf_meta.product_version = "0.0.25";
@@ -125,16 +125,16 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 	/* We're making build/test/DCP/dcp_test2 */
 	boost::filesystem::remove_all ("build/test/DCP/dcp_test2");
 	boost::filesystem::create_directories ("build/test/DCP/dcp_test2");
-	dcp::DCP d ("build/test/DCP/dcp_test2");
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+	dcp::dc::Package d ("build/test/DCP/dcp_test2");
+	shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("A Test DCP", dcp::dc::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);
 
-	shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1)));
+	shared_ptr<dcp::dc::StereoPictureAsset> mp (new dcp::dc::StereoPictureAsset (dcp::dc::Fraction (24, 1)));
 	mp->set_metadata (mxf_meta);
-	shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", dcp::SMPTE, false);
-	dcp::File j2c ("test/data/32x32_red_square.j2c");
+	shared_ptr<dcp::dc::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", dcp::dc::SMPTE, false);
+	dcp::dc::File j2c ("test/data/32x32_red_square.j2c");
 	for (int i = 0; i < 24; ++i) {
 		/* Left */
 		picture_writer->write (j2c.data (), j2c.size ());
@@ -143,9 +143,9 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 	}
 	picture_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_meta);
-	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", dcp::SMPTE);
+	shared_ptr<dcp::dc::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", dcp::dc::SMPTE);
 
 	SF_INFO info;
 	info.format = 0;
@@ -164,23 +164,23 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
 	sound_writer->finalize ();
 
-	cpl->add (shared_ptr<dcp::Reel> (
-			  new dcp::Reel (
-				  shared_ptr<dcp::ReelStereoPictureAsset> (new dcp::ReelStereoPictureAsset (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::ReelStereoPictureAsset> (new dcp::dc::ReelStereoPictureAsset (mp, 0)),
+				  shared_ptr<dcp::dc::ReelSoundAsset> (new dcp::dc::ReelSoundAsset (ms, 0)),
+				  shared_ptr<dcp::dc::ReelSubtitleAsset> ()
 				  )
 			  ));
 
 	d.add (cpl);
 
-	d.write_xml (dcp::SMPTE, xml_meta);
+	d.write_xml (dcp::dc::SMPTE, xml_meta);
 
 	/* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run-tests.sh */
 }
 
 static void
-note (dcp::NoteType, string)
+note (dcp::dc::NoteType, string)
 {
 
 }
@@ -188,22 +188,22 @@ note (dcp::NoteType, string)
 /** Test comparison of a DCP with itself */
 BOOST_AUTO_TEST_CASE (dcp_test3)
 {
-	dcp::DCP A ("test/ref/DCP/dcp_test1");
+	dcp::dc::Package A ("test/ref/DCP/dcp_test1");
 	A.read ();
-	dcp::DCP B ("test/ref/DCP/dcp_test1");
+	dcp::dc::Package B ("test/ref/DCP/dcp_test1");
 	B.read ();
 
-	BOOST_CHECK (A.equals (B, dcp::EqualityOptions(), boost::bind (&note, _1, _2)));
+	BOOST_CHECK (A.equals (B, dcp::dc::EqualityOptions(), boost::bind (&note, _1, _2)));
 }
 
 /** Test comparison of a DCP with a different DCP */
 BOOST_AUTO_TEST_CASE (dcp_test4)
 {
-	dcp::DCP A ("test/ref/DCP/dcp_test1");
+	dcp::dc::Package A ("test/ref/DCP/dcp_test1");
 	A.read ();
-	dcp::DCP B ("test/ref/DCP/dcp_test2");
+	dcp::dc::Package B ("test/ref/DCP/dcp_test2");
 	B.read ();
 
-	BOOST_CHECK (!A.equals (B, dcp::EqualityOptions(), boost::bind (&note, _1, _2)));
+	BOOST_CHECK (!A.equals (B, dcp::dc::EqualityOptions(), boost::bind (&note, _1, _2)));
 }