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

5 files changed, 23 insertions, 25 deletions

diff --git a/tools/common.cc b/tools/common.cc
index bf87ccc0..c8b7c606 100644
--- a/tools/common.cc
+++ b/tools/common.cc
@@ -25,7 +25,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 void
-dcp::dc::filter_errors (dcp::dc::Package::ReadErrors& errors, bool ignore_missing_assets)
+dcp::filter_errors (dcp::dc::Package::ReadErrors& errors, bool ignore_missing_assets)
 {
 	for (Package::ReadErrors::iterator i = errors.begin(); i != errors.end(); ) {
 
diff --git a/tools/common.h b/tools/common.h
index c2d3e91c..0b1dd341 100644
--- a/tools/common.h
+++ b/tools/common.h
@@ -20,9 +20,7 @@
 #include "exceptions.h"
 
 namespace dcp {
-namespace dc {
 
-extern void filter_errors (std::list<boost::shared_ptr<DCPReadError> >& errors, bool ignore_missing_assets);
+extern void filter_errors (std::list<boost::shared_ptr<PackageReadError> >& errors, bool ignore_missing_assets);
 
 }
-}
diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 814d46a0..50240a85 100644
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -61,9 +61,9 @@ help (string n)
 }
 
 void
-note (NoteType t, string n)
+note (dcp::NoteType t, string n)
 {
-	if (t == DCP_ERROR || verbose) {
+	if (t == dcp::DCP_ERROR || verbose) {
 		cout << " " << n << "\n";
 		cout.flush ();
 	}
@@ -83,16 +83,16 @@ load_dcp (boost::filesystem::path path, bool keep_going, bool ignore_missing_ass
 		}
 
 		if (key) {
-			list<shared_ptr<Asset> > assets = dcp->assets ();
-			for (list<shared_ptr<Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) {
-				shared_ptr<MXF> mxf = dynamic_pointer_cast<MXF> (*i);
+			list<shared_ptr<dcp::Asset> > assets = dcp->assets ();
+			for (list<shared_ptr<dcp::Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) {
+				shared_ptr<dcp::MXF> mxf = dynamic_pointer_cast<dcp::MXF> (*i);
 				if (mxf) {
-					mxf->set_key (Key (key.get ()));
+					mxf->set_key (dcp::Key (key.get ()));
 				}
 			}
 		}
 
-	} catch (FileError& e) {
+	} catch (dcp::FileError& e) {
 		cerr << "Could not read DCP " << path.string() << "; " << e.what() << " " << e.filename() << "\n";
 		exit (EXIT_FAILURE);
 	}
@@ -103,7 +103,7 @@ load_dcp (boost::filesystem::path path, bool keep_going, bool ignore_missing_ass
 int
 main (int argc, char* argv[])
 {
-	EqualityOptions options;
+	dcp::EqualityOptions options;
 	options.max_mean_pixel_error = 5;
 	options.max_std_dev_pixel_error = 5;
 	options.reel_hashes_can_differ = true;
diff --git a/tools/dcpdumpsub.cc b/tools/dcpdumpsub.cc
index 237b3656..ca98551b 100644
--- a/tools/dcpdumpsub.cc
+++ b/tools/dcpdumpsub.cc
@@ -71,14 +71,14 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
-	dcp::dc::SMPTESubtitleAsset sub (argv[optind]);
+	dcp::SMPTESubtitleAsset sub (argv[optind]);
 
 	cout << sub.xml_as_string() << "\n";
 
 	if (extract_fonts) {
-		map<string, dcp::dc::Data> fonts = sub.fonts_with_load_ids ();
-		for (map<string, dcp::dc::Data>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
-			FILE* f = dcp::dc::fopen_boost (i->first + ".ttf", "wb");
+		map<string, dcp::Data> fonts = sub.fonts_with_load_ids ();
+		for (map<string, dcp::Data>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
+			FILE* f = dcp::fopen_boost (i->first + ".ttf", "wb");
 			if (!f) {
 				cerr << "Could not open font file " << i->first << ".ttf for writing";
 				exit (EXIT_FAILURE);
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 477159fc..4febf977 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -83,18 +83,18 @@ main_subtitle (shared_ptr<Reel> reel, bool list_subtitles)
 		return;
 	}
 
-	list<SubtitleString> subs = reel->main_subtitle()->asset()->subtitles ();
+	list<dcp::SubtitleString> subs = reel->main_subtitle()->asset()->subtitles ();
 	cout << "      Subtitle: " << subs.size() << " subtitles";
 	shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (reel->main_subtitle()->asset());
 	if (iop) {
 		cout << " in " << iop->language() << "\n";
 	}
-	shared_ptr<SMPTESubtitleAsset> smpte = dynamic_pointer_cast<SMPTESubtitleAsset> (reel->main_subtitle()->asset());
+	shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (reel->main_subtitle()->asset());
 	if (smpte && smpte->language ()) {
 		cout << " in " << smpte->language().get() << "\n";
 	}
 	if (list_subtitles) {
-		BOOST_FOREACH (SubtitleString const& k, subs) {
+		BOOST_FOREACH (dcp::SubtitleString const& k, subs) {
 			cout << k << "\n";
 		}
 	}
@@ -158,17 +158,17 @@ main (int argc, char* argv[])
 	try {
 		dcp = new Package (argv[optind]);
 		dcp->read (keep_going, &errors);
-	} catch (FileError& e) {
+	} catch (dcp::FileError& e) {
 		cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n";
 		exit (EXIT_FAILURE);
-	} catch (DCPReadError& e) {
+	} catch (dcp::PackageReadError& e) {
 		cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n";
 		exit (EXIT_FAILURE);
 	}
 
 	cout << "DCP: " << boost::filesystem::path(argv[optind]).filename().string() << "\n";
 
-	dcp::dc::filter_errors (errors, ignore_missing_assets);
+	dcp::filter_errors (errors, ignore_missing_assets);
 	for (Package::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) {
 		cerr << "Error: " << (*i)->what() << "\n";
 	}
@@ -186,7 +186,7 @@ main (int argc, char* argv[])
 
 			try {
 				main_picture (*j);
-			} catch (UnresolvedRefError& e) {
+			} catch (dcp::UnresolvedRefError& e) {
 				if (keep_going) {
 					if (!ignore_missing_assets) {
 						cerr << e.what() << " (for main picture)\n";
@@ -198,7 +198,7 @@ main (int argc, char* argv[])
 
 			try {
 				main_sound (*j);
-			} catch (UnresolvedRefError& e) {
+			} catch (dcp::UnresolvedRefError& e) {
 				if (keep_going) {
 					if (!ignore_missing_assets) {
 						cerr << e.what() << " (for main sound)\n";
@@ -210,7 +210,7 @@ main (int argc, char* argv[])
 
 			try {
 				main_subtitle (*j, subtitles);
-			} catch (UnresolvedRefError& e) {
+			} catch (dcp::UnresolvedRefError& e) {
 				if (keep_going) {
 					if (!ignore_missing_assets) {
 						cerr << e.what() << " (for main subtitle)\n";