It builds again.

1 files changed, 31 insertions, 30 deletions

diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc
index b2b2d363..77dd29d7 100644
--- a/test/subtitle_tests.cc
+++ b/test/subtitle_tests.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,22 +17,23 @@
 
 */
 
+#include "subtitle_content.h"
+#include "subtitle_string.h"
 #include <boost/test/unit_test.hpp>
-#include "subtitle_asset.h"
 
 using std::list;
 using boost::shared_ptr;
 
-/* Load a subtitle asset from XML and check that it is read correctly */
+/* Load some subtitle content from XML and check that it is read correctly */
 BOOST_AUTO_TEST_CASE (subtitles1)
 {
-	dcp::SubtitleAsset subs ("test/data/subs1.xml");
+	dcp::SubtitleContent subs ("test/data/subs1.xml");
 
 	BOOST_CHECK_EQUAL (subs.language(), "French");
 
-	list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_at (dcp::Time (0, 0, 6, 1));
+	list<shared_ptr<dcp::SubtitleString> > s = subs.subtitles_at (dcp::Time (0, 0, 6, 1));
 	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -50,7 +51,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 							 
 	s = subs.subtitles_at (dcp::Time (0, 0, 7, 190));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -65,7 +66,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -83,7 +84,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 
 	s = subs.subtitles_at (dcp::Time (0, 0, 11, 95));
 	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -101,7 +102,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 
 	s = subs.subtitles_at (dcp::Time (0, 0, 14, 42));
 	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -121,11 +122,11 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 /** And similarly for another one */
 BOOST_AUTO_TEST_CASE (subtitles2)
 {
-	dcp::SubtitleAsset subs ("test/data/subs2.xml");
+	dcp::SubtitleContent subs ("test/data/subs2.xml");
 
-	list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_at (dcp::Time (0, 0, 42, 100));
+	list<shared_ptr<dcp::SubtitleString> > s = subs.subtitles_at (dcp::Time (0, 0, 42, 100));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -140,7 +141,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -158,7 +159,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 0, 50, 50));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -173,7 +174,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -191,7 +192,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 2, 300));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -206,7 +207,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -224,7 +225,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 15, 50));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -239,7 +240,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -257,7 +258,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 27, 200));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -272,7 +273,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -290,7 +291,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 42, 300));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -305,7 +306,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -323,7 +324,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 45, 200));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -338,7 +339,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -356,7 +357,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 47, 249));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -371,7 +372,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -389,7 +390,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 2, 6, 210));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -404,7 +405,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),