Fix build.

2 files changed, 56 insertions, 56 deletions

diff --git a/test/dcp_reader_test.cc b/test/dcp_reader_test.cc
index 8d0fda1..b1b825d 100644
--- a/test/dcp_reader_test.cc
+++ b/test/dcp_reader_test.cc
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 	list<sub::Subtitle>::iterator i = subs.begin ();
 	BOOST_CHECK (i != subs.end ());
 	BOOST_CHECK_EQUAL (i->from.metric().get(), sub::MetricTime (0, 0, 5, 198 * 4));
-	BOOST_CHECK_EQUAL (i->to.metric(), sub::MetricTime (0, 0, 7, 115 * 4));
+	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 0, 7, 115 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 4));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 4));
 
@@ -52,9 +52,8 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.15, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::BOTTOM_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "My jacket was Idi Amin's");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-
 		++j;
 		BOOST_CHECK (j == i->lines.end ());
 	}
@@ -78,7 +77,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.21, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::BOTTOM_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "My corset was H.M. The Queen's");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -92,7 +91,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.15, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::BOTTOM_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "My large wonderbra");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -118,7 +117,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.15, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::BOTTOM_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "Once belonged to the Shah");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -127,7 +126,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 
 	++i;
 	BOOST_CHECK (i != subs.end ());
-	BOOST_CHECK_EQUAL (i->from.metric(), sub::MetricTime (0, 0, 13, 104 * 4));
+	BOOST_CHECK_EQUAL (i->from.metric().get(), sub::MetricTime (0, 0, 13, 104 * 4));
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 0, 15, 177 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 4));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 4));
@@ -144,7 +143,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.15, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::BOTTOM_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "And these are Roy Hattersley's jeans");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -160,7 +159,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 
 	list<sub::Subtitle>::iterator i = subs.begin ();
 	BOOST_CHECK (i != subs.end ());
-	BOOST_CHECK_EQUAL (i->from.metric(), sub::MetricTime (0, 0, 41, 62 * 4));
+	BOOST_CHECK_EQUAL (i->from.metric().get(), sub::MetricTime (0, 0, 41, 62 * 4));
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 0, 43, 52 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
@@ -177,9 +176,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "At afternoon tea with John Peel");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -191,16 +190,16 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "I enquired if his accent was real");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
 		BOOST_CHECK (j == i->lines.end ());
 	}
-		
+
 	++i;
 	BOOST_CHECK (i != subs.end ());
-	BOOST_CHECK_EQUAL (i->from.metric(), sub::MetricTime (0, 0, 50, 42 * 4));
+	BOOST_CHECK_EQUAL (i->from.metric().get(), sub::MetricTime (0, 0, 50, 42 * 4));
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 0, 52, 21 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
@@ -217,7 +216,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "He said \"out of the house");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -231,7 +230,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "I'm incredibly scouse");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -257,9 +256,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "At home it depends how I feel.\"");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -273,7 +272,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "I spent a long weekend in Brighton");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 		BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 		BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
@@ -288,7 +287,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 1, 16, 42 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
-	
+
 	{
 		list<sub::Line>::iterator j = i->lines.begin ();
 		BOOST_CHECK (j != i->lines.end ());
@@ -301,9 +300,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "With the legendary Miss Enid Blyton");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -315,7 +314,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "She said \"you be Noddy");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -327,8 +326,8 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->from.metric().get(), sub::MetricTime (0, 1, 20, 219 * 4));
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 1, 22, 73 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
-	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));	
-	
+	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
+
 	{
 		list<sub::Line>::iterator j = i->lines.begin ();
 		BOOST_CHECK (j != i->lines.end ());
@@ -341,9 +340,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "and I'll show you my body\"");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -355,7 +354,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "But Big Ears kept turning the light on.");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -368,7 +367,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 1, 28, 208 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
-	
+
 	{
 		list<sub::Line>::iterator j = i->lines.begin ();
 		BOOST_CHECK (j != i->lines.end ());
@@ -381,9 +380,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "That curious creature the Sphinx");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -395,7 +394,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "Is smarter than anyone thinks");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -421,9 +420,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "It sits there and smirks");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -435,7 +434,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "And you don't think it works");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -448,7 +447,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 1, 47, 94 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
-	
+
 	{
 		list<sub::Line>::iterator j = i->lines.begin ();
 		BOOST_CHECK (j != i->lines.end ());
@@ -461,9 +460,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "Then when you're not looking, it winks.");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -475,7 +474,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "When it snows you will find Sister Sledge");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
@@ -488,7 +487,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 1, 48, 167 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
-	
+
 	{
 		list<sub::Line>::iterator j = i->lines.begin ();
 		BOOST_CHECK (j != i->lines.end ());
@@ -501,9 +500,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "Out mooning, at night, on the ledge");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -515,20 +514,20 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "One storey down");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
 		BOOST_CHECK (j == i->lines.end ());
 	}
-		
+
 	++i;
 	BOOST_CHECK (i != subs.end ());
 	BOOST_CHECK_EQUAL (i->from.metric().get(), sub::MetricTime (0, 1, 53, 21 * 4));
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 1, 56, 10 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
-	
+
 	{
 		list<sub::Line>::iterator j = i->lines.begin ();
 		BOOST_CHECK (j != i->lines.end ());
@@ -541,9 +540,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "Is the maestro, James Brown");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -555,20 +554,20 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "Displaying his meat and two veg.");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
 		BOOST_CHECK (j == i->lines.end ());
 	}
-	
+
 	++i;
 	BOOST_CHECK (i != subs.end ());
 	BOOST_CHECK_EQUAL (i->from.metric().get(), sub::MetricTime (0, 2, 5, 208 * 4));
 	BOOST_CHECK_EQUAL (i->to.metric().get(), sub::MetricTime (0, 2, 7, 31 * 4));
 	BOOST_CHECK_EQUAL (i->fade_up.get(), sub::MetricTime (0, 0, 0, 0));
 	BOOST_CHECK_EQUAL (i->fade_down.get(), sub::MetricTime (0, 0, 0, 0));
-	
+
 	{
 		list<sub::Line>::iterator j = i->lines.begin ();
 		BOOST_CHECK (j != i->lines.end ());
@@ -581,9 +580,9 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.89, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "HELLO");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-		
+
 		++j;
 		BOOST_CHECK (j != i->lines.end ());
 		BOOST_CHECK_EQUAL (j->blocks.size(), 1);
@@ -595,7 +594,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
 		BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.95, 1);
 		BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SCREEN);
 		BOOST_CHECK_EQUAL (b.text, "WORLD");
-		BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
+		BOOST_CHECK_EQUAL (b.effect.get(), sub::BORDER);
 		BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
 
 		++j;
diff --git a/test/test.cc b/test/test.cc
index 4c0b8bf..4f6bdd0 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -23,6 +23,7 @@
 #include <boost/filesystem.hpp>
 #include <fstream>
 #include <string>
+#include <iostream>
 #include "iso6937_tables.h"
 
 using std::string;
@@ -63,10 +64,10 @@ check_text (boost::filesystem::path a, boost::filesystem::path b)
 	if (!boost::filesystem::exists (b)) {
 		cerr << "File not found: " << b << "\n";
 	}
-	
+
 	BOOST_CHECK (boost::filesystem::exists (a));
 	BOOST_CHECK (boost::filesystem::exists (b));
-	
+
 	ifstream p (a.c_str ());
 	ifstream q (b.c_str ());
 
@@ -91,7 +92,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 	BOOST_CHECK (ref_file);
 	FILE* check_file = fopen (check.string().c_str(), "rb");
 	BOOST_CHECK (check_file);
-	
+
 	int const buffer_size = 65536;
 	uint8_t* ref_buffer = new uint8_t[buffer_size];
 	uint8_t* check_buffer = new uint8_t[buffer_size];