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

1 files changed, 9 insertions, 9 deletions

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";