Fix handling of timing in SMPTE subtitles.

3 files changed, 159 insertions, 146 deletions

diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc
index 9f0072ab..c987517e 100644
--- a/test/dcp_time_test.cc
+++ b/test/dcp_time_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -23,53 +23,69 @@
 /** Check that dcp::Time works */
 BOOST_AUTO_TEST_CASE (dcp_time)
 {
-	dcp::Time t (977143, 24);
+	/* tcr of 250 makes the editable event length the same as an Interop `tick' */
+	dcp::Time t (977143, 24, 250);
 
-	BOOST_CHECK_EQUAL (t.t, 73);
+	BOOST_CHECK_EQUAL (t.e, 73);
 	BOOST_CHECK_EQUAL (t.s, 34);
 	BOOST_CHECK_EQUAL (t.m, 18);
 	BOOST_CHECK_EQUAL (t.h, 11);
 	BOOST_CHECK_EQUAL (t.to_string(), "11:18:34:73");
-	BOOST_CHECK_EQUAL (t.to_ticks(), 10178573);
 
-	dcp::Time a (3, 2, 3, 4);
-	dcp::Time b (2, 3, 4, 5);
+	/* Use a tcr of 24 so that the editable event is a frame */
+	dcp::Time a (3, 2, 3, 4, 24);
+	dcp::Time b (2, 3, 4, 5, 24);
 
 	dcp::Time r = a - b;
 	BOOST_CHECK_EQUAL (r.h, 0);
 	BOOST_CHECK_EQUAL (r.m, 58);
 	BOOST_CHECK_EQUAL (r.s, 58);
-	BOOST_CHECK_EQUAL (r.t, 249);
-	BOOST_CHECK_EQUAL (r.to_string(), "0:58:58:249");
-	BOOST_CHECK_EQUAL (r.to_ticks(), 884749);
+	BOOST_CHECK_EQUAL (r.e, 23);
+	BOOST_CHECK_EQUAL (r.to_string(), "0:58:58:23");
 
-	a = dcp::Time (1, 58, 56, 240);
-	b = dcp::Time (1, 7, 12, 120);
+	/* Different tcr (25) */
+	a = dcp::Time (1, 58, 56, 2, 25);
+	b = dcp::Time (1, 7, 12, 1, 25);
 	r = a + b;
 	BOOST_CHECK_EQUAL (r.h, 3);
 	BOOST_CHECK_EQUAL (r.m, 6);
-	BOOST_CHECK_EQUAL (r.s, 9);
-	BOOST_CHECK_EQUAL (r.t, 110);
-	BOOST_CHECK_EQUAL (r.to_string(), "3:6:9:110");
-	BOOST_CHECK_EQUAL (r.to_ticks(), 2792360);
+	BOOST_CHECK_EQUAL (r.s, 8);
+	BOOST_CHECK_EQUAL (r.e, 3);
+	BOOST_CHECK_EQUAL (r.to_string(), "3:6:8:3");
 
-	a = dcp::Time (24, 12, 6, 3);
-	b = dcp::Time (16, 8, 4, 2);
+	/* Another arbitrary tcr (30) */
+	a = dcp::Time (24, 12, 6, 3, 30);
+	b = dcp::Time (16, 8, 4, 2, 30);
 	BOOST_CHECK_CLOSE (a / b, 1.5, 1e-5);
 
-	BOOST_CHECK_EQUAL (dcp::Time (4128391203LL).to_ticks(), 4128391203LL);
-	BOOST_CHECK_EQUAL (dcp::Time (60000).to_ticks(), 60000);
+	a = dcp::Time (3600 * 24, 24, 250);
+	BOOST_CHECK_EQUAL (a.h, 1);
+	BOOST_CHECK_EQUAL (a.m, 0);
+	BOOST_CHECK_EQUAL (a.s, 0);
+	BOOST_CHECK_EQUAL (a.e, 0);
+
+	a = dcp::Time (60 * 24, 24, 250);
+	BOOST_CHECK_EQUAL (a.h, 0);
+	BOOST_CHECK_EQUAL (a.m, 1);
+	BOOST_CHECK_EQUAL (a.s, 0);
+	BOOST_CHECK_EQUAL (a.e, 0);
 
 	/* Check rounding; 3424 is 142.666666666... seconds or 0.166666666... ticks */
-	a = dcp::Time (3424, 24);
+	a = dcp::Time (3424, 24, 250);
 	BOOST_CHECK_EQUAL (a.h, 0);
 	BOOST_CHECK_EQUAL (a.m, 2);
 	BOOST_CHECK_EQUAL (a.s, 22);
-	BOOST_CHECK_EQUAL (a.t, 167);
+	BOOST_CHECK_EQUAL (a.e, 167);
 
-	a = dcp::Time (3425, 24);
+	a = dcp::Time (3425, 24, 250);
 	BOOST_CHECK_EQUAL (a.h, 0);
 	BOOST_CHECK_EQUAL (a.m, 2);
 	BOOST_CHECK_EQUAL (a.s, 22);
-	BOOST_CHECK_EQUAL (a.t, 177);
+	BOOST_CHECK_EQUAL (a.e, 177);
+
+	/* Check addition of times with different tcrs */
+	a = dcp::Time (0, 0, 0, 3, 24);
+	b = dcp::Time (0, 0, 0, 4, 48);
+	r = a + b;
+	BOOST_CHECK_EQUAL (r, dcp::Time (0, 0, 0, 240, 1152));
 }
diff --git a/test/subtitle_test.cc b/test/subtitle_test.cc
index c7137bec..a3694717 100644
--- a/test/subtitle_test.cc
+++ b/test/subtitle_test.cc
@@ -32,91 +32,91 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 
 	BOOST_CHECK_EQUAL (subs.language(), "French");
 
-	list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 6, 1), dcp::Time (0, 0, 6, 2));
-	BOOST_CHECK_EQUAL (s.size(), 1);
+	list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 1);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   39,
-				   dcp::Time (0, 0, 5, 198),
-				   dcp::Time (0, 0, 7, 115),
+				   dcp::Time (0, 0, 5, 198, 250),
+				   dcp::Time (0, 0, 7, 115, 250),
 				   15,
 				   dcp::BOTTOM,
 				   "My jacket was Idi Amin's",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 1),
-				   dcp::Time (0, 0, 0, 1)
+				   dcp::Time (0, 0, 0, 1, 250),
+				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
 							 
-	s = subs.subtitles_during (dcp::Time (0, 0, 7, 190), dcp::Time (0, 0, 7, 191));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   39,
-				   dcp::Time (0, 0, 7, 177),
-				   dcp::Time (0, 0, 11, 31),
+				   dcp::Time (0, 0, 7, 177, 250),
+				   dcp::Time (0, 0, 11, 31, 250),
 				   21,
 				   dcp::BOTTOM,
 				   "My corset was H.M. The Queen's",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 1),
-				   dcp::Time (0, 0, 0, 1)
+				   dcp::Time (0, 0, 0, 1, 250),
+				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   39,
-				   dcp::Time (0, 0, 7, 177),
-				   dcp::Time (0, 0, 11, 31),
+				   dcp::Time (0, 0, 7, 177, 250),
+				   dcp::Time (0, 0, 11, 31, 250),
 				   15,
 				   dcp::BOTTOM,
 				   "My large wonderbra",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 1),
-				   dcp::Time (0, 0, 0, 1)
+				   dcp::Time (0, 0, 0, 1, 250),
+				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 11, 95), dcp::Time (0, 0, 11, 96));
-	BOOST_CHECK_EQUAL (s.size(), 1);
+	s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 1);
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   39,
-				   dcp::Time (0, 0, 11, 94),
-				   dcp::Time (0, 0, 13, 63),
+				   dcp::Time (0, 0, 11, 94, 250),
+				   dcp::Time (0, 0, 13, 63, 250),
 				   15,
 				   dcp::BOTTOM,
 				   "Once belonged to the Shah",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 1),
-				   dcp::Time (0, 0, 0, 1)
+				   dcp::Time (0, 0, 0, 1, 250),
+				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 14, 42), dcp::Time (0, 0, 14, 43));
-	BOOST_CHECK_EQUAL (s.size(), 1);
+	s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 1);
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   39,
-				   dcp::Time (0, 0, 13, 104),
-				   dcp::Time (0, 0, 15, 177),
+				   dcp::Time (0, 0, 13, 104, 250),
+				   dcp::Time (0, 0, 15, 177, 250),
 				   15,
 				   dcp::BOTTOM,
 				   "And these are Roy Hattersley's jeans",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 1),
-				   dcp::Time (0, 0, 0, 1)
+				   dcp::Time (0, 0, 0, 1, 250),
+				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
 }
 
@@ -125,303 +125,300 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 {
 	dcp::InteropSubtitleContent subs ("test/data/subs2.xml");
 
-	list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 42, 100), dcp::Time (0, 0, 42, 101));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 0, 41, 62),
-				   dcp::Time (0, 0, 43, 52),
+				   dcp::Time (0, 0, 41, 62, 250),
+				   dcp::Time (0, 0, 43, 52, 250),
 				   89,
 				   dcp::TOP,
 				   "At afternoon tea with John Peel",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 0, 41, 62),
-				   dcp::Time (0, 0, 43, 52),
+				   dcp::Time (0, 0, 41, 62, 250),
+				   dcp::Time (0, 0, 43, 52, 250),
 				   95,
 				   dcp::TOP,
 				   "I enquired if his accent was real",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 50, 50), dcp::Time (0, 0, 50, 51));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 0, 50, 42),
-				   dcp::Time (0, 0, 52, 21),
+				   dcp::Time (0, 0, 50, 42, 250),
+				   dcp::Time (0, 0, 52, 21, 250),
 				   89,
 				   dcp::TOP,
 				   "He said \"out of the house",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 0, 50, 42),
-				   dcp::Time (0, 0, 52, 21),
+				   dcp::Time (0, 0, 50, 42, 250),
+				   dcp::Time (0, 0, 52, 21, 250),
 				   95,
 				   dcp::TOP,
 				   "I'm incredibly scouse",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 2, 300), dcp::Time (0, 1, 2, 301));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 2, 208),
-				   dcp::Time (0, 1, 4, 10),
+				   dcp::Time (0, 1, 2, 208, 250),
+				   dcp::Time (0, 1, 4, 10, 250),
 				   89,
 				   dcp::TOP,
 				   "At home it depends how I feel.\"",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 2, 208),
-				   dcp::Time (0, 1, 4, 10),
+				   dcp::Time (0, 1, 2, 208, 250),
+				   dcp::Time (0, 1, 4, 10, 250),
 				   95,
 				   dcp::TOP,
 				   "I spent a long weekend in Brighton",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 15, 50), dcp::Time (0, 1, 15, 51));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 15, 42),
-				   dcp::Time (0, 1, 16, 42),
+				   dcp::Time (0, 1, 15, 42, 250),
+				   dcp::Time (0, 1, 16, 42, 250),
 				   89,
 				   dcp::TOP,
 				   "With the legendary Miss Enid Blyton",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 15, 42),
-				   dcp::Time (0, 1, 16, 42),
+				   dcp::Time (0, 1, 15, 42, 250),
+				   dcp::Time (0, 1, 16, 42, 250),
 				   95,
 				   dcp::TOP,
 				   "She said \"you be Noddy",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 27, 200), dcp::Time (0, 1, 27, 201));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 27, 115),
-				   dcp::Time (0, 1, 28, 208),
+				   dcp::Time (0, 1, 27, 115, 250),
+				   dcp::Time (0, 1, 28, 208, 250),
 				   89,
 				   dcp::TOP,
 				   "That curious creature the Sphinx",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 27, 115),
-				   dcp::Time (0, 1, 28, 208),
+				   dcp::Time (0, 1, 27, 115, 250),
+				   dcp::Time (0, 1, 28, 208, 250),
 				   95,
 				   dcp::TOP,
 				   "Is smarter than anyone thinks",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 42, 300), dcp::Time (0, 1, 42, 301));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 42, 229),
-				   dcp::Time (0, 1, 45, 62),
+				   dcp::Time (0, 1, 42, 229, 250),
+				   dcp::Time (0, 1, 45, 62, 250),
 				   89,
 				   dcp::TOP,
 				   "It sits there and smirks",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 42, 229),
-				   dcp::Time (0, 1, 45, 62),
+				   dcp::Time (0, 1, 42, 229, 250),
+				   dcp::Time (0, 1, 45, 62, 250),
 				   95,
 				   dcp::TOP,
 				   "And you don't think it works",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 45, 200), dcp::Time (0, 1, 45, 201));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 45, 146),
-				   dcp::Time (0, 1, 47, 94),
+				   dcp::Time (0, 1, 45, 146, 250),
+				   dcp::Time (0, 1, 47, 94, 250),
 				   89,
 				   dcp::TOP,
 				   "Then when you're not looking, it winks.",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 45, 146),
-				   dcp::Time (0, 1, 47, 94),
+				   dcp::Time (0, 1, 45, 146, 250),
+				   dcp::Time (0, 1, 47, 94, 250),
 				   95,
 				   dcp::TOP,
 				   "When it snows you will find Sister Sledge",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 47, 249), dcp::Time (0, 1, 47, 250));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 47, 146),
-				   dcp::Time (0, 1, 48, 167),
+				   dcp::Time (0, 1, 47, 146, 250),
+				   dcp::Time (0, 1, 48, 167, 250),
 				   89,
 				   dcp::TOP,
 				   "Out mooning, at night, on the ledge",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 1, 47, 146),
-				   dcp::Time (0, 1, 48, 167),
+				   dcp::Time (0, 1, 47, 146, 250),
+				   dcp::Time (0, 1, 48, 167, 250),
 				   95,
 				   dcp::TOP,
 				   "One storey down",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 2, 6, 210), dcp::Time (0, 2, 6, 211));
-	BOOST_CHECK_EQUAL (s.size(), 2);
+	s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250));
+	BOOST_REQUIRE_EQUAL (s.size(), 2);
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 2, 5, 208),
-				   dcp::Time (0, 2, 7, 31),
+				   dcp::Time (0, 2, 5, 208, 250),
+				   dcp::Time (0, 2, 7, 31, 250),
 				   89,
 				   dcp::TOP,
 				   "HELLO",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   dcp::Colour (255, 255, 255),
 				   42,
-				   dcp::Time (0, 2, 5, 208),
-				   dcp::Time (0, 2, 7, 31),
+				   dcp::Time (0, 2, 5, 208, 250),
+				   dcp::Time (0, 2, 7, 31, 250),
 				   95,
 				   dcp::TOP,
 				   "WORLD",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
-				   dcp::Time (0, 0, 0, 0),
-				   dcp::Time (0, 0, 0, 0)
+				   dcp::Time (0, 0, 0, 0, 250),
+				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-
-	
-	
 }
diff --git a/test/text_test.cc b/test/text_test.cc
index 55cb20c1..b8d76207 100644
--- a/test/text_test.cc
+++ b/test/text_test.cc
@@ -31,7 +31,7 @@ BOOST_AUTO_TEST_CASE (text_test1)
 	text->set_attribute("VAlign", "top");
 	text->add_child_text("Hello world");
 
-	dcp::Text t (cxml::NodePtr (new cxml::Node (text)));
+	dcp::Text t (cxml::NodePtr (new cxml::Node (text)), 250);
 	BOOST_CHECK_CLOSE (t.v_position, 4.2, 0.001);
 	BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
 	BOOST_CHECK_EQUAL (t.text, "Hello world");
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (text_test2)
 	text->set_attribute("Valign", "top");
 	text->add_child_text("Hello world");
 
-	dcp::Text t (cxml::NodePtr (new cxml::Node (text)));
+	dcp::Text t (cxml::NodePtr (new cxml::Node (text)), 250);
 	BOOST_CHECK_CLOSE (t.v_position, 4.2, 0.001);
 	BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
 	BOOST_CHECK_EQUAL (t.text, "Hello world");