SubtitleString -> shared_ptr<Subtitle>

1 files changed, 49 insertions, 26 deletions

diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index 7febaab4..c91ba03c 100644
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -44,9 +44,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 	BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId");
 	BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf");
 
-	list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
+	list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -70,7 +71,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   true,
 				   false,
@@ -91,7 +93,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -115,7 +118,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -139,7 +143,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   true,
@@ -167,9 +172,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 {
 	dcp::InteropSubtitleAsset subs ("test/data/subs2.xml");
 
-	list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
+	list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -190,7 +196,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -214,7 +221,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -235,7 +243,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -259,7 +268,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -280,7 +290,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -304,7 +315,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -325,7 +337,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -349,7 +362,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -370,7 +384,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -394,7 +409,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -415,7 +431,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -439,7 +456,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -460,7 +478,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -484,7 +503,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -505,7 +525,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -529,7 +550,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -550,7 +572,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,