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

1 files changed, 10 insertions, 10 deletions

diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
index 16f3f7d1..13ff51f2 100644
--- a/examples/read_dcp.cc
+++ b/examples/read_dcp.cc
@@ -57,16 +57,16 @@ main ()
 	}
 
 	std::cout << "DCP has " << dcp.cpls().size() << " CPLs.\n";
-	std::list<boost::shared_ptr<dcp::dc::Asset> > assets = dcp.assets ();
+	std::list<boost::shared_ptr<dcp::Asset> > assets = dcp.assets ();
 	std::cout << "DCP has " << assets.size() << " assets.\n";
-	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)) {
+	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)) {
 			std::cout << "2D picture\n";
-		} else if (boost::dynamic_pointer_cast<dcp::dc::StereoPictureAsset> (*i)) {
+		} else if (boost::dynamic_pointer_cast<dcp::StereoPictureAsset> (*i)) {
 			std::cout << "3D picture\n";
-		} else if (boost::dynamic_pointer_cast<dcp::dc::SoundAsset> (*i)) {
+		} else if (boost::dynamic_pointer_cast<dcp::SoundAsset> (*i)) {
 			std::cout << "Sound\n";
-		} else if (boost::dynamic_pointer_cast<dcp::dc::SubtitleAsset> (*i)) {
+		} else if (boost::dynamic_pointer_cast<dcp::SubtitleAsset> (*i)) {
 			std::cout << "Subtitle\n";
 		} else if (boost::dynamic_pointer_cast<dcp::dc::CPL> (*i)) {
 			std::cout << "CPL\n";
@@ -78,19 +78,19 @@ main ()
 	boost::shared_ptr<dcp::dc::CPL> cpl = dcp.cpls().front ();
 
 	/* Get the picture asset in the first reel */
-	boost::shared_ptr<dcp::dc::MonoPictureAsset> picture_asset = boost::dynamic_pointer_cast<dcp::dc::MonoPictureAsset> (
+	boost::shared_ptr<dcp::MonoPictureAsset> picture_asset = boost::dynamic_pointer_cast<dcp::MonoPictureAsset> (
 		cpl->reels().front()->main_picture()->asset()
 		);
 
 	/* Get the 1000th frame of it */
-	boost::shared_ptr<const dcp::dc::MonoPictureFrame> picture_frame_j2k = picture_asset->get_frame(999);
+	boost::shared_ptr<const dcp::MonoPictureFrame> picture_frame_j2k = picture_asset->get_frame(999);
 
 	/* Get the frame as an XYZ image */
-	boost::shared_ptr<const dcp::dc::OpenJPEGImage> picture_image_xyz = picture_frame_j2k->xyz_image ();
+	boost::shared_ptr<const dcp::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::dc::xyz_to_rgba (picture_image_xyz, dcp::dc::ColourConversion::srgb_to_xyz(), rgba.get ());
+	dcp::xyz_to_rgba (picture_image_xyz, dcp::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");