Build against libdcp1.

4 files changed, 39 insertions, 36 deletions

diff --git a/test/dcp_reader_test.cc b/test/dcp_reader_test.cc
index 8d0fda1..7fd1621 100644
--- a/test/dcp_reader_test.cc
+++ b/test/dcp_reader_test.cc
@@ -30,7 +30,7 @@ using boost::shared_ptr;
 /* Test reading of a DCP XML file */
 BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 {
-	sub::DCPReader reader ("test/data/test1.xml");
+	sub::DCPReader reader ("test/data/test1.xml", true);
 	list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
 
 	list<sub::Subtitle>::iterator i = subs.begin ();
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFontId");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (39) / (72 * 11));
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFontId");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (39) / (72 * 11));
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFontId");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (39) / (72 * 11));
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFontId");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (39) / (72 * 11));
@@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFontId");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (39) / (72 * 11));
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 /* And another one */
 BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 {
-	sub::DCPReader reader ("test/data/test2.xml");
+	sub::DCPReader reader ("test/data/test2.xml", true);
 	list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
 
 	list<sub::Subtitle>::iterator i = subs.begin ();
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -224,7 +224,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -250,7 +250,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -294,7 +294,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -308,7 +308,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -334,7 +334,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -348,7 +348,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -374,7 +374,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -388,7 +388,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -414,7 +414,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -428,7 +428,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -454,7 +454,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -468,7 +468,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -494,7 +494,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -508,7 +508,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -534,7 +534,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -548,7 +548,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, false);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -574,7 +574,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		sub::Block b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
@@ -588,7 +588,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
 		b = j->blocks.front ();
-		BOOST_CHECK_EQUAL (b.font, "Arial");
+		BOOST_CHECK_EQUAL (b.font, "theFont");
 		BOOST_CHECK_EQUAL (b.italic, true);
 		BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
 		BOOST_CHECK_EQUAL (b.font_size.proportional().get(), float (42) / (72 * 11));
diff --git a/test/dcp_to_stl_binary_test.cc b/test/dcp_to_stl_binary_test.cc
index 3643a95..8ac377b 100644
--- a/test/dcp_to_stl_binary_test.cc
+++ b/test/dcp_to_stl_binary_test.cc
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test1)
 
 	boost::filesystem::path p = private_test / "fd586c30-6d38-48f2-8241-27359acf184c_sub.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p, true).subtitles ()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test2)
 
 	boost::filesystem::path p = private_test / "93e8a6bf-499e-4d36-9350-a9bfa2e6758a_sub.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p, true).subtitles ()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3)
 
 	boost::filesystem::path p = private_test / "Paddington_FTR_Subs_DE-FR_24fps_R1.xml";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p, true).subtitles ()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3)
 BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test4)
 {
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader("test/data/test1.xml").subtitles ()),
+		sub::collect<list<sub::Subtitle> > (sub::DCPReader("test/data/test1.xml", true).subtitles ()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test5)
 
 	boost::filesystem::path p = private_test / "065d39ff-6723-4dbf-a94f-849cde82f5e1_sub.mxf";
 	sub::write_stl_binary (
-		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p).subtitles ()),
+		sub::collect<list<sub::Subtitle> > (sub::DCPReader(p, false).subtitles ()),
 		25,
 		sub::LANGUAGE_FRENCH,
 		"", "",
diff --git a/test/test.cc b/test/test.cc
index 4c0b8bf..693e5b2 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -106,7 +106,10 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 
 		for (uintmax_t i = 0; i < this_time; ++i) {
 			stringstream s;
-			s << "Files differ at offset " << (offset + i) << "; reference is " << hex << ((int) ref_buffer[i]) << ", check is " << ((int) check_buffer[i]);
+			s << "Files differ at offset " << (offset + i)
+			  << "; reference is " << hex << ((int) ref_buffer[i])
+			  << ", check is " << hex << ((int) check_buffer[i]);
+			
 			BOOST_CHECK_MESSAGE (ref_buffer[i] == check_buffer[i], s.str ());
 		}
 
diff --git a/test/wscript b/test/wscript
index 2c8c327..23b731c 100644
--- a/test/wscript
+++ b/test/wscript
@@ -18,7 +18,7 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
     obj.uselib = 'BOOST_TEST DCP CXML'
-    obj.use    = 'libsub'
+    obj.use    = 'libsub-1.0'
     obj.source = """
                  dcp_reader_test.cc
                  dcp_to_stl_binary_test.cc