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

2 files changed, 26 insertions, 26 deletions

diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc
index ae7890a5..c1182dea 100644
--- a/examples/make_dcp.cc
+++ b/examples/make_dcp.cc
@@ -48,19 +48,19 @@ main ()
 {
 	/* Create a directory to put the DCP in */
 	boost::filesystem::create_directory ("DCP");
-	
+
 	/* Make a picture asset.  This is a file which combines JPEG2000 files together to make
 	   up the video of the DCP.  First, create the object, specifying a frame rate of 24 frames
 	   per second.
 	*/
 
-	boost::shared_ptr<dcp::MonoPictureAsset> picture_asset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
+	boost::shared_ptr<dcp::dc::MonoPictureAsset> picture_asset (new dcp::dc::MonoPictureAsset (dcp::dc::Fraction (24, 1)));
 
 	/* Start off a write to it */
-	boost::shared_ptr<dcp::PictureAssetWriter> picture_writer = picture_asset->start_write ("DCP/picture.mxf", dcp::SMPTE, false);
+	boost::shared_ptr<dcp::dc::PictureAssetWriter> picture_writer = picture_asset->start_write ("DCP/picture.mxf", dcp::dc::SMPTE, false);
 
 	/* Write 24 frames of the same JPEG2000 file */
-	dcp::File picture ("examples/help.j2c");
+	dcp::dc::File picture ("examples/help.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write (picture.data(), picture.size());
 	}
@@ -71,8 +71,8 @@ main ()
 	/* Now create a sound MXF.  As before, create an object and a writer.
 	   When creating the object we specify the sampling rate (48kHz) and the number of channels (2).
 	*/
-	boost::shared_ptr<dcp::SoundAsset> sound_asset (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 2));
-	boost::shared_ptr<dcp::SoundAssetWriter> sound_writer = sound_asset->start_write ("DCP/sound.mxf", dcp::SMPTE);
+	boost::shared_ptr<dcp::dc::SoundAsset> sound_asset (new dcp::dc::SoundAsset (dcp::dc::Fraction (24, 1), 48000, 2));
+	boost::shared_ptr<dcp::dc::SoundAssetWriter> sound_writer = sound_asset->start_write ("DCP/sound.mxf", dcp::dc::SMPTE);
 
 	/* Write some sine waves */
 	float* audio[2];
@@ -90,22 +90,22 @@ main ()
 	sound_writer->finalize ();
 
 	/* Now create a reel */
-	boost::shared_ptr<dcp::Reel> reel (new dcp::Reel ());
+	boost::shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ());
 
 	/* Add picture and sound to it.  The zeros are the `entry points', i.e. the first
 	   (video) frame from the assets that the reel should play.
 	*/
-	reel->add (boost::shared_ptr<dcp::ReelPictureAsset> (new dcp::ReelMonoPictureAsset (picture_asset, 0)));
-	reel->add (boost::shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (sound_asset, 0)));
+	reel->add (boost::shared_ptr<dcp::dc::ReelPictureAsset> (new dcp::dc::ReelMonoPictureAsset (picture_asset, 0)));
+	reel->add (boost::shared_ptr<dcp::dc::ReelSoundAsset> (new dcp::dc::ReelSoundAsset (sound_asset, 0)));
 
 	/* Make a CPL with this reel */
-	boost::shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE));
+	boost::shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("My film", dcp::dc::FEATURE));
 	cpl->add (reel);
 
 	/* Write the DCP */
-	dcp::DCP dcp ("DCP");
+	dcp::dc::Package dcp ("DCP");
 	dcp.add (cpl);
-	dcp.write_xml (dcp::SMPTE);
-	
+	dcp.write_xml (dcp::dc::SMPTE);
+
 	return 0;
 }
diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
index 4e3f4836..b7ee5b72 100644
--- a/examples/read_dcp.cc
+++ b/examples/read_dcp.cc
@@ -46,7 +46,7 @@ int
 main ()
 {
 	/* Create a DCP, specifying where our existing data is */
-	dcp::DCP dcp ("/home/carl/diagonal.com/APPASSIONATA_TLR_F_UK-DEFR_CH_51_2K_LOK_20121115_DGL_OV");
+	dcp::dc::Package dcp ("/home/carl/diagonal.com/APPASSIONATA_TLR_F_UK-DEFR_CH_51_2K_LOK_20121115_DGL_OV");
 	/* Read the DCP to find out about it */
 	dcp.read ();
 
@@ -57,40 +57,40 @@ main ()
 	}
 
 	std::cout << "DCP has " << dcp.cpls().size() << " CPLs.\n";
-	std::list<boost::shared_ptr<dcp::Asset> > assets = dcp.assets ();
+	std::list<boost::shared_ptr<dcp::dc::Asset> > assets = dcp.assets ();
 	std::cout << "DCP has " << assets.size() << " assets.\n";
-	for (std::list<boost::shared_ptr<dcp::Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) {
-		if (boost::dynamic_pointer_cast<dcp::MonoPictureAsset> (*i)) {
+	for (std::list<boost::shared_ptr<dcp::dc::Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) {
+		if (boost::dynamic_pointer_cast<dcp::dc::MonoPictureAsset> (*i)) {
 			std::cout << "2D picture\n";
-		} else if (boost::dynamic_pointer_cast<dcp::StereoPictureAsset> (*i)) {
+		} else if (boost::dynamic_pointer_cast<dcp::dc::StereoPictureAsset> (*i)) {
 			std::cout << "3D picture\n";
-		} else if (boost::dynamic_pointer_cast<dcp::SoundAsset> (*i)) {
+		} else if (boost::dynamic_pointer_cast<dcp::dc::SoundAsset> (*i)) {
 			std::cout << "Sound\n";
-		} else if (boost::dynamic_pointer_cast<dcp::SubtitleAsset> (*i)) {
+		} else if (boost::dynamic_pointer_cast<dcp::dc::SubtitleAsset> (*i)) {
 			std::cout << "Subtitle\n";
-		} else if (boost::dynamic_pointer_cast<dcp::CPL> (*i)) {
+		} else if (boost::dynamic_pointer_cast<dcp::dc::CPL> (*i)) {
 			std::cout << "CPL\n";
 		}
 		std::cout << "\t" << (*i)->file().leaf().string() << "\n";
 	}
 
 	/* Take the first CPL */
-	boost::shared_ptr<dcp::CPL> cpl = dcp.cpls().front ();
+	boost::shared_ptr<dcp::dc::CPL> cpl = dcp.cpls().front ();
 
 	/* Get the picture asset in the first reel */
-	boost::shared_ptr<dcp::MonoPictureAsset> picture_asset = boost::dynamic_pointer_cast<dcp::MonoPictureAsset> (
+	boost::shared_ptr<dcp::dc::MonoPictureAsset> picture_asset = boost::dynamic_pointer_cast<dcp::dc::MonoPictureAsset> (
 		cpl->reels().front()->main_picture()->asset()
 		);
 
 	/* Get the 1000th frame of it */
-	boost::shared_ptr<const dcp::MonoPictureFrame> picture_frame_j2k = picture_asset->get_frame(999);
+	boost::shared_ptr<const dcp::dc::MonoPictureFrame> picture_frame_j2k = picture_asset->get_frame(999);
 
 	/* Get the frame as an XYZ image */
-	boost::shared_ptr<const dcp::OpenJPEGImage> picture_image_xyz = picture_frame_j2k->xyz_image ();
+	boost::shared_ptr<const dcp::dc::OpenJPEGImage> picture_image_xyz = picture_frame_j2k->xyz_image ();
 
 	/* Convert to ARGB */
 	boost::scoped_array<uint8_t> rgba (new uint8_t[picture_image_xyz->size().width * picture_image_xyz->size().height * 4]);
-	dcp::xyz_to_rgba (picture_image_xyz, dcp::ColourConversion::srgb_to_xyz(), rgba.get ());
+	dcp::dc::xyz_to_rgba (picture_image_xyz, dcp::dc::ColourConversion::srgb_to_xyz(), rgba.get ());
 
 	Magick::Image image (picture_image_xyz->size().width, picture_image_xyz->size().height, "BGRA", Magick::CharPixel, rgba.get ());
 	image.write ("frame.png");