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

1 files changed, 18 insertions, 18 deletions

diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 9a482f09..c8dc81b8 100644
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -38,32 +38,32 @@ using boost::shared_array;
 BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
 {
 	boost::filesystem::path directory = "build/test/interop_dcp_font_test";
-	dcp::DCP dcp (directory);
+	dcp::dc::Package dcp (directory);
 
-	shared_ptr<dcp::InteropSubtitleAsset> subs (new dcp::InteropSubtitleAsset ());
+	shared_ptr<dcp::dc::InteropSubtitleAsset> subs (new dcp::dc::InteropSubtitleAsset ());
 	subs->add_font ("theFontId", "test/data/dummy.ttf");
 	subs->write (directory / "frobozz.xml");
 	check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/dummy.ttf");
 
-	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
-	reel->add (shared_ptr<dcp::ReelAsset> (new dcp::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0)));
+	shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ());
+	reel->add (shared_ptr<dcp::dc::ReelAsset> (new dcp::dc::ReelSubtitleAsset (subs, dcp::dc::Fraction (24, 1), 24, 0)));
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("", dcp::TRAILER));
+	shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("", dcp::dc::TRAILER));
 	cpl->add (reel);
 
 	dcp.add (cpl);
-	dcp.write_xml (dcp::INTEROP);
+	dcp.write_xml (dcp::dc::INTEROP);
 
-	dcp::DCP dcp2 (directory);
+	dcp::dc::Package dcp2 (directory);
 	dcp2.read ();
-	shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
+	shared_ptr<dcp::dc::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::dc::SubtitleAsset> (
 		dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset()
 		);
 	BOOST_REQUIRE (subs2);
 	BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1);
 
 	boost::uintmax_t const size = boost::filesystem::file_size ("test/data/dummy.ttf");
-	FILE* f = dcp::fopen_boost ("test/data/dummy.ttf", "rb");
+	FILE* f = dcp::dc::fopen_boost ("test/data/dummy.ttf", "rb");
 	BOOST_REQUIRE (f);
 	shared_array<uint8_t> ref (new uint8_t[size]);
 	fread (ref.get(), 1, size, f);
@@ -76,31 +76,31 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
 BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
 {
 	boost::filesystem::path directory = "build/test/smpte_dcp_font_test";
-	dcp::DCP dcp (directory);
+	dcp::dc::Package dcp (directory);
 
-	shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset ());
+	shared_ptr<dcp::dc::SMPTESubtitleAsset> subs (new dcp::dc::SMPTESubtitleAsset ());
 	subs->add_font ("theFontId", "test/data/dummy.ttf");
 	subs->write (directory / "frobozz.mxf");
 
-	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
-	reel->add (shared_ptr<dcp::ReelAsset> (new dcp::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0)));
+	shared_ptr<dcp::dc::Reel> reel (new dcp::dc::Reel ());
+	reel->add (shared_ptr<dcp::dc::ReelAsset> (new dcp::dc::ReelSubtitleAsset (subs, dcp::dc::Fraction (24, 1), 24, 0)));
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("", dcp::TRAILER));
+	shared_ptr<dcp::dc::CPL> cpl (new dcp::dc::CPL ("", dcp::dc::TRAILER));
 	cpl->add (reel);
 
 	dcp.add (cpl);
-	dcp.write_xml (dcp::SMPTE);
+	dcp.write_xml (dcp::dc::SMPTE);
 
-	dcp::DCP dcp2 (directory);
+	dcp::dc::Package dcp2 (directory);
 	dcp2.read ();
-	shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
+	shared_ptr<dcp::dc::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::dc::SubtitleAsset> (
 		dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset()
 		);
 	BOOST_REQUIRE (subs2);
 	BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1);
 
 	boost::uintmax_t const size = boost::filesystem::file_size ("test/data/dummy.ttf");
-	FILE* f = dcp::fopen_boost ("test/data/dummy.ttf", "rb");
+	FILE* f = dcp::dc::fopen_boost ("test/data/dummy.ttf", "rb");
 	BOOST_REQUIRE (f);
 	shared_array<uint8_t> ref (new uint8_t[size]);
 	fread (ref.get(), 1, size, f);