Change subtitle SubtitleAsset API to return const Subtitle pointers; add subtitles_in_reel().

2 files changed, 61 insertions, 60 deletions

diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index ba097222..d37e60d4 100644
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -62,8 +62,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 
 	auto 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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -87,8 +87,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   true,
 				   false,
@@ -109,8 +109,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -134,8 +134,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -159,8 +159,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   true,
@@ -190,8 +190,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	auto 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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -212,8 +212,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -237,8 +237,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -259,8 +259,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -284,8 +284,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -306,8 +306,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -331,8 +331,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -353,8 +353,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -378,8 +378,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -400,8 +400,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -425,8 +425,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -447,8 +447,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -472,8 +472,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -494,8 +494,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -519,8 +519,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -541,8 +541,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -566,8 +566,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_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -588,8 +588,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -618,7 +618,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
 	dcp::InteropSubtitleAsset subs ("test/data/subs3.xml");
 
 	BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
-	shared_ptr<dcp::SubtitleImage> si = dynamic_pointer_cast<dcp::SubtitleImage>(subs.subtitles().front());
+	auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles().front());
 	BOOST_REQUIRE (si);
 	BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
 }
diff --git a/test/read_smpte_subtitle_test.cc b/test/read_smpte_subtitle_test.cc
index 8fbf0214..15fc5dd8 100644
--- a/test/read_smpte_subtitle_test.cc
+++ b/test/read_smpte_subtitle_test.cc
@@ -73,12 +73,12 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
 	BOOST_CHECK_EQUAL (smpte_lfn->id, "theFontId");
 	BOOST_CHECK_EQUAL (smpte_lfn->urn, "9118bbce-4105-4a05-b37c-a5a6f75e1fea");
 	BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 63);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(sc.subtitles().front()));
-	BOOST_CHECK_EQUAL (dynamic_pointer_cast<dcp::SubtitleString>(sc.subtitles().front())->text(), "Noch mal.");
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front()));
+	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front())->text(), "Noch mal.");
 	BOOST_CHECK_EQUAL (sc.subtitles().front()->in(), dcp::Time (0, 0, 25, 12, 25));
 	BOOST_CHECK_EQUAL (sc.subtitles().front()->out(), dcp::Time (0, 0, 26, 4, 25));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(sc.subtitles().back()));
-	BOOST_CHECK_EQUAL (dynamic_pointer_cast<dcp::SubtitleString>(sc.subtitles().back())->text(), "Prochainement");
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().back()));
+	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().back())->text(), "Prochainement");
 	BOOST_CHECK_EQUAL (sc.subtitles().back()->in(), dcp::Time (0, 1, 57, 17, 25));
 	BOOST_CHECK_EQUAL (sc.subtitles().back()->out(), dcp::Time (0, 1, 58, 12, 25));
 }
@@ -88,34 +88,35 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
 {
 	dcp::SMPTESubtitleAsset sc (private_test / "olsson.xml");
 
-	BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 6);
-	auto i = sc.subtitles().begin();
-	shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+	auto subs = sc.subtitles();
+	BOOST_REQUIRE_EQUAL (subs.size(), 6);
+	auto i = 0;
+	auto is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), "Testing is ");
 	BOOST_CHECK (!is->italic());
 	++i;
-	is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), "really");
 	BOOST_CHECK (is->italic());
 	++i;
-	is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), " fun!");
 	BOOST_CHECK (!is->italic());
 	++i;
-	is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), "This is the ");
 	BOOST_CHECK (!is->italic());
 	++i;
-	is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), "second");
 	BOOST_CHECK (is->italic());
 	++i;
-	is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), " line!");
 	BOOST_CHECK (!is->italic());
@@ -127,7 +128,7 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test3)
 	dcp::SMPTESubtitleAsset subs ("test/data/subs.mxf");
 
 	BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
-	shared_ptr<dcp::SubtitleImage> si = dynamic_pointer_cast<dcp::SubtitleImage>(subs.subtitles().front());
+	auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles()[0]);
 	BOOST_REQUIRE (si);
 	BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
 }