Extend SubtitleAsset::subtitles_during to allow asking for subtitles either starting during a particular timescale or overllapping it.

1 files changed, 13 insertions, 13 deletions

diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index aa1baeee..a66327f1 100644
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -44,7 +44,7 @@ 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));
+	list<dcp::SubtitleString> 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 (
 				   string ("theFontId"),
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250));
+	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 (
 				   string ("theFontId"),
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250));
+	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 (
 				   string ("theFontId"),
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250));
+	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 (
 				   string ("theFontId"),
@@ -152,7 +152,7 @@ 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));
+	list<dcp::SubtitleString> 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 (
 				   string ("theFont"),
@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250));
+	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 (
 				   string ("theFont"),
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250));
+	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 (
 				   string ("theFont"),
@@ -269,7 +269,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250));
+	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 (
 				   string ("theFont"),
@@ -308,7 +308,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250));
+	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 (
 				   string ("theFont"),
@@ -347,7 +347,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250));
+	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 (
 				   string ("theFont"),
@@ -386,7 +386,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250));
+	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 (
 				   string ("theFont"),
@@ -425,7 +425,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250));
+	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 (
 				   string ("theFont"),
@@ -464,7 +464,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250));
+	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 (
 				   string ("theFont"),