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

1 files changed, 25 insertions, 25 deletions

diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc
index 61b38ec4..73035809 100644
--- a/test/dcp_time_test.cc
+++ b/test/dcp_time_test.cc
@@ -24,80 +24,80 @@
 BOOST_AUTO_TEST_CASE (dcp_time)
 {
 	/* tcr of 250 makes the editable event length the same as an Interop `tick' */
-	dcp::Time t (977143, 24, 250);
+	dcp::dc::Time t (977143, 24, 250);
 
 	BOOST_CHECK_EQUAL (t.e, 73);
 	BOOST_CHECK_EQUAL (t.s, 34);
 	BOOST_CHECK_EQUAL (t.m, 18);
 	BOOST_CHECK_EQUAL (t.h, 11);
-	BOOST_CHECK_EQUAL (t.as_string(dcp::INTEROP), "11:18:34:073");
+	BOOST_CHECK_EQUAL (t.as_string(dcp::dc::INTEROP), "11:18:34:073");
 
 	/* Use a tcr of 24 so that the editable event is a frame */
-	dcp::Time a (3, 2, 3, 4, 24);
-	dcp::Time b (2, 3, 4, 5, 24);
+	dcp::dc::Time a (3, 2, 3, 4, 24);
+	dcp::dc::Time b (2, 3, 4, 5, 24);
 
-	dcp::Time r = a - b;
+	dcp::dc::Time r = a - b;
 	BOOST_CHECK_EQUAL (r.h, 0);
 	BOOST_CHECK_EQUAL (r.m, 58);
 	BOOST_CHECK_EQUAL (r.s, 58);
 	BOOST_CHECK_EQUAL (r.e, 23);
-	BOOST_CHECK_EQUAL (r.as_string(dcp::INTEROP), "00:58:58:023");
+	BOOST_CHECK_EQUAL (r.as_string(dcp::dc::INTEROP), "00:58:58:023");
 
 	/* Different tcr (25) */
-	a = dcp::Time (1, 58, 56, 2, 25);
-	b = dcp::Time (1, 7, 12, 1, 25);
+	a = dcp::dc::Time (1, 58, 56, 2, 25);
+	b = dcp::dc::Time (1, 7, 12, 1, 25);
 	r = a + b;
 	BOOST_CHECK_EQUAL (r.h, 3);
 	BOOST_CHECK_EQUAL (r.m, 6);
 	BOOST_CHECK_EQUAL (r.s, 8);
 	BOOST_CHECK_EQUAL (r.e, 3);
-	BOOST_CHECK_EQUAL (r.as_string(dcp::INTEROP), "03:06:08:003");
+	BOOST_CHECK_EQUAL (r.as_string(dcp::dc::INTEROP), "03:06:08:003");
 
 	/* Another arbitrary tcr (30) */
-	a = dcp::Time (24, 12, 6, 3, 30);
-	b = dcp::Time (16, 8, 4, 2, 30);
+	a = dcp::dc::Time (24, 12, 6, 3, 30);
+	b = dcp::dc::Time (16, 8, 4, 2, 30);
 	BOOST_CHECK_CLOSE (a / b, 1.5, 1e-5);
 
-	a = dcp::Time (3600 * 24, 24, 250);
+	a = dcp::dc::Time (3600 * 24, 24, 250);
 	BOOST_CHECK_EQUAL (a.h, 1);
 	BOOST_CHECK_EQUAL (a.m, 0);
 	BOOST_CHECK_EQUAL (a.s, 0);
 	BOOST_CHECK_EQUAL (a.e, 0);
 
-	a = dcp::Time (60 * 24, 24, 250);
+	a = dcp::dc::Time (60 * 24, 24, 250);
 	BOOST_CHECK_EQUAL (a.h, 0);
 	BOOST_CHECK_EQUAL (a.m, 1);
 	BOOST_CHECK_EQUAL (a.s, 0);
 	BOOST_CHECK_EQUAL (a.e, 0);
 
 	/* Check rounding; 3424 is 142.666666666... seconds or 0.166666666... ticks */
-	a = dcp::Time (3424, 24, 250);
+	a = dcp::dc::Time (3424, 24, 250);
 	BOOST_CHECK_EQUAL (a.h, 0);
 	BOOST_CHECK_EQUAL (a.m, 2);
 	BOOST_CHECK_EQUAL (a.s, 22);
 	BOOST_CHECK_EQUAL (a.e, 167);
 
-	a = dcp::Time (3425, 24, 250);
+	a = dcp::dc::Time (3425, 24, 250);
 	BOOST_CHECK_EQUAL (a.h, 0);
 	BOOST_CHECK_EQUAL (a.m, 2);
 	BOOST_CHECK_EQUAL (a.s, 22);
 	BOOST_CHECK_EQUAL (a.e, 177);
 
 	/* Check addition of times with different tcrs */
-	a = dcp::Time (0, 0, 0, 3, 24);
-	b = dcp::Time (0, 0, 0, 4, 48);
+	a = dcp::dc::Time (0, 0, 0, 3, 24);
+	b = dcp::dc::Time (0, 0, 0, 4, 48);
 	r = a + b;
-	BOOST_CHECK_EQUAL (r, dcp::Time (0, 0, 0, 240, 1152));
+	BOOST_CHECK_EQUAL (r, dcp::dc::Time (0, 0, 0, 240, 1152));
 
 	/* Check rounding on conversion from seconds */
-	BOOST_CHECK_EQUAL (dcp::Time (80.990, 1000), dcp::Time (0, 1, 20, 990, 1000));
+	BOOST_CHECK_EQUAL (dcp::dc::Time (80.990, 1000), dcp::dc::Time (0, 1, 20, 990, 1000));
 
 	/* Check rebase() */
-	a = dcp::Time (1, 58, 56, 2, 25);
-	BOOST_CHECK_EQUAL (a.rebase (250), dcp::Time (1, 58, 56, 20, 250));
-	b = dcp::Time (9, 12, 41, 17, 99);
-	BOOST_CHECK_EQUAL (b.rebase (250), dcp::Time (9, 12, 41, 42, 250));
+	a = dcp::dc::Time (1, 58, 56, 2, 25);
+	BOOST_CHECK_EQUAL (a.rebase (250), dcp::dc::Time (1, 58, 56, 20, 250));
+	b = dcp::dc::Time (9, 12, 41, 17, 99);
+	BOOST_CHECK_EQUAL (b.rebase (250), dcp::dc::Time (9, 12, 41, 42, 250));
 	/* We must round down in rebase() */
-	a = dcp::Time (0, 2, 57, 999, 1000);
-	BOOST_CHECK_EQUAL (a.rebase (250), dcp::Time (0, 2, 57, 249, 250));
+	a = dcp::dc::Time (0, 2, 57, 999, 1000);
+	BOOST_CHECK_EQUAL (a.rebase (250), dcp::dc::Time (0, 2, 57, 249, 250));
 }