It builds again.

11 files changed, 89 insertions, 102 deletions

diff --git a/test/cpl_sar.cc b/test/cpl_sar_test.cc
index 3ab1ec26..0c62ea8b 100644
--- a/test/cpl_sar.cc
+++ b/test/cpl_sar_test.cc
@@ -17,10 +17,11 @@
 
 */
 
-#include <boost/test/unit_test.hpp>
-#include <libcxml/cxml.h>
 #include "cpl.h"
+#include "reel_mono_picture_asset.h"
 #include "mono_picture_mxf.h"
+#include <libcxml/cxml.h>
+#include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
 
@@ -29,24 +30,23 @@ using boost::shared_ptr;
 */
 BOOST_AUTO_TEST_CASE (cpl_sar)
 {
-	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF ("build/test/foo/video.mxf"));
-	mp->set_interop (true);
+	shared_ptr<dcp::ReelMonoPictureAsset> pa (new dcp::ReelMonoPictureAsset ());
 
 	{
-		mp->set_size (dcp::Size (1998, 1080));
+		pa->set_screen_aspect_ratio (dcp::Fraction (1998, 1080));
 		xmlpp::Document doc;
 		xmlpp::Element* el = doc.create_root_node ("Test");
-		mp->write_to_cpl (el);
+		pa->write_to_cpl (el, dcp::INTEROP);
 		
 		cxml::Node node (el);
 		BOOST_CHECK_EQUAL (node.node_child("MainPicture")->string_child ("ScreenAspectRatio"), "1.85");
 	}
 
 	{
-		mp->set_size (dcp::Size (2048, 858));
+		pa->set_screen_aspect_ratio (dcp::Fraction (2048, 858));
 		xmlpp::Document doc;
 		xmlpp::Element* el = doc.create_root_node ("Test");
-		mp->write_to_cpl (el);
+		pa->write_to_cpl (el, dcp::INTEROP);
 		
 		cxml::Node node (el);
 		BOOST_CHECK_EQUAL (node.node_child("MainPicture")->string_child ("ScreenAspectRatio"), "2.39");
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index b1cb5265..030f0b58 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -24,6 +24,7 @@
 #include "cpl.h"
 #include "argb_frame.h"
 #include "mono_picture_mxf.h"
+#include "reel_picture_asset.h"
 #include "reel.h"
 #include "test.h"
 
@@ -34,7 +35,7 @@ static shared_ptr<const dcp::ARGBFrame>
 get_frame (dcp::DCP const & dcp)
 {
 	shared_ptr<const dcp::Reel> reel = dcp.cpls().front()->reels().front ();
-	shared_ptr<const dcp::PictureMXF> picture = reel->main_picture ();
+	shared_ptr<dcp::PictureMXF> picture = reel->main_picture()->mxf ();
 	BOOST_CHECK (picture);
 
 	shared_ptr<const dcp::MonoPictureMXF> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureMXF> (picture);
@@ -62,7 +63,7 @@ BOOST_AUTO_TEST_CASE (decryption_test)
 		"test/data/private.key"
 		);
 
-	encrypted.add_kdm (kdm);
+	encrypted.add (kdm);
 
 	shared_ptr<const dcp::ARGBFrame> plaintext_frame = get_frame (plaintext);
 	shared_ptr<const dcp::ARGBFrame> encrypted_frame = get_frame (encrypted);
diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
index 06df7058..a17b0a01 100644
--- a/test/read_dcp_test.cc
+++ b/test/read_dcp_test.cc
@@ -33,8 +33,6 @@ BOOST_AUTO_TEST_CASE (read_dcp)
 	list<shared_ptr<dcp::CPL> > cpls = d.cpls ();
 	BOOST_CHECK_EQUAL (cpls.size(), 1);
 
-	BOOST_CHECK_EQUAL (cpls.front()->name(), "A Test DCP");
+	BOOST_CHECK_EQUAL (cpls.front()->annotation_text(), "A Test DCP");
 	BOOST_CHECK_EQUAL (cpls.front()->content_kind(), dcp::FEATURE);
-	BOOST_CHECK_EQUAL (cpls.front()->frames_per_second(), 24);
-	BOOST_CHECK_EQUAL (cpls.front()->length(), 24);
 }
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index b67c54f7..1d51a711 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -48,9 +48,8 @@ BOOST_AUTO_TEST_CASE (recovery)
 	
 	boost::filesystem::remove_all ("build/test/baz");
 	boost::filesystem::create_directories ("build/test/baz");
-	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (24));
-	mp->set_size (dcp::Size (32, 32));
-	shared_ptr<dcp::PictureMXFWriter> writer = mp->start_write ("build/test/baz/video1.mxf", false);
+	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
+	shared_ptr<dcp::PictureMXFWriter> writer = mp->start_write ("build/test/baz/video1.mxf", dcp::SMPTE, false);
 
 	int written_size = 0;
 	for (int i = 0; i < 24; ++i) {
@@ -77,9 +76,8 @@ BOOST_AUTO_TEST_CASE (recovery)
 	Kumu::ResetTestRNG ();
 #endif	
 
-	mp.reset (new dcp::MonoPictureMXF (24));
-	mp->set_size (dcp::Size (32, 32));
-	writer = mp->start_write ("build/test/baz/video2.mxf", true);
+	mp.reset (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
+	writer = mp->start_write ("build/test/baz/video2.mxf", dcp::SMPTE, true);
 
 	writer->write (data, size);
 
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index 5628ec70..fdb41a2c 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -1,8 +1,28 @@
+/*
+    Copyright (C) 2012-2014 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <iostream>
 #include "dcp.h"
 #include "cpl.h"
 #include "reel.h"
-#include "subtitle_asset.h"
+#include "subtitle_content.h"
+#include "reel_subtitle_asset.h"
 #include "exceptions.h"
 
 using std::cout;
@@ -21,7 +41,7 @@ try
 	}
 
 	DCP* dcp = new DCP (argv[1]);
-	dcp->read (false);
+	dcp->read ();
 	
 	list<shared_ptr<CPL> > cpls = dcp->cpls ();
 	for (list<boost::shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) {
@@ -30,7 +50,7 @@ try
 		for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
 
 			if ((*j)->main_subtitle()) {
-				(*j)->main_subtitle()->write_xml ();
+				(*j)->main_subtitle()->subtitle_content()->write_xml ();
 			}
 		}
 	}
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 69bf63f9..8b1efbd7 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -30,6 +30,9 @@
 #include "mono_picture_frame.h"
 #include "argb_frame.h"
 #include "signer_chain.h"
+#include "mono_picture_mxf_writer.h"
+#include "reel_picture_asset.h"
+#include "file.h"
 
 using std::list;
 using boost::shared_ptr;
@@ -56,12 +59,9 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	boost::filesystem::path work_dir = "build/test/round_trip_test";
 	boost::filesystem::create_directory (work_dir);
 
-	shared_ptr<dcp::MonoPictureMXF> asset_A (new dcp::MonoPictureMXF (work_dir, "video.mxf"));
-	asset_A->set_edit_rate (24);
-	shared_ptr<PictureMXFWriter> writer;
-	boost::filesystem::path mxf = work_dir + "video.mxf";
-	writer->start_write (mxf, false);
-	TestFile j2c ("test/data/32x32_red_square.j2c");
+	shared_ptr<dcp::MonoPictureMXF> mxf_A (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
+	shared_ptr<dcp::PictureMXFWriter> writer = mxf_A->start_write (work_dir / "video.mxf", dcp::SMPTE, false);
+	dcp::File j2c ("test/data/32x32_red_square.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
 	}
@@ -69,10 +69,12 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	dcp::Key key;
 
-	asset_A->set_key (key);
+	mxf_A->set_key (key);
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL (work_dir, "A Test DCP", dcp::FEATURE, 24, 24));
-	cpl->add_reel (shared_ptr<dcp::Reel> (new dcp::Reel (asset_A, shared_ptr<dcp::SoundMXF> (), shared_ptr<dcp::SubtitleAsset> ())));
+	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
+	reel->add (shared_ptr<dcp::ReelPictureAsset> (mxf_A, 0));
+	cpl->add (reel);
 
 	/* A KDM using our certificate chain's leaf key pair */
 	dcp::KDM kdm_A (
@@ -105,14 +107,14 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	}
 
 	/* Reload the picture MXF */
-	shared_ptr<dcp::MonoPictureMXF> asset_B (
-		new dcp::MonoPictureMXF (work_dir, "video.mxf")
+	shared_ptr<dcp::MonoPictureMXF> mxf_B (
+		new dcp::MonoPictureMXF (work_dir / "video.mxf")
 		);
 
-	asset_B->set_key (kdm_B.keys().front().key());
+	mxf_B->set_key (kdm_B.keys().front().key());
 
-	shared_ptr<dcp::ARGBFrame> frame_A = asset_A->get_frame(0)->argb_frame ();
-	shared_ptr<dcp::ARGBFrame> frame_B = asset_B->get_frame(0)->argb_frame ();
+	shared_ptr<dcp::ARGBFrame> frame_A = mxf_A->get_frame(0)->argb_frame ();
+	shared_ptr<dcp::ARGBFrame> frame_B = mxf_B->get_frame(0)->argb_frame ();
 	BOOST_CHECK_EQUAL (frame_A->size().width, frame_B->size().width);
 	BOOST_CHECK_EQUAL (frame_A->size().height, frame_B->size().height);
 	BOOST_CHECK_EQUAL (memcmp (frame_A->data(), frame_B->data(), frame_A->size().width * frame_A->size().height), 0);
diff --git a/test/subs_in_out.cc b/test/subs_in_out.cc
index 40e5476c..9b2c2e9b 100644
--- a/test/subs_in_out.cc
+++ b/test/subs_in_out.cc
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "subtitle_asset.h"
+#include "subtitle_content.h"
 
 using namespace std;
 
@@ -10,7 +10,7 @@ int main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 	
-	dcp::SubtitleAsset s (argv[1]);
+	dcp::SubtitleContent s (argv[1]);
 	cout << s.xml_as_string ();
 	return 0;
 }
diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc
index b2b2d363..77dd29d7 100644
--- a/test/subtitle_tests.cc
+++ b/test/subtitle_tests.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -17,22 +17,23 @@
 
 */
 
+#include "subtitle_content.h"
+#include "subtitle_string.h"
 #include <boost/test/unit_test.hpp>
-#include "subtitle_asset.h"
 
 using std::list;
 using boost::shared_ptr;
 
-/* Load a subtitle asset from XML and check that it is read correctly */
+/* Load some subtitle content from XML and check that it is read correctly */
 BOOST_AUTO_TEST_CASE (subtitles1)
 {
-	dcp::SubtitleAsset subs ("test/data/subs1.xml");
+	dcp::SubtitleContent subs ("test/data/subs1.xml");
 
 	BOOST_CHECK_EQUAL (subs.language(), "French");
 
-	list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_at (dcp::Time (0, 0, 6, 1));
+	list<shared_ptr<dcp::SubtitleString> > s = subs.subtitles_at (dcp::Time (0, 0, 6, 1));
 	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -50,7 +51,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 							 
 	s = subs.subtitles_at (dcp::Time (0, 0, 7, 190));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -65,7 +66,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -83,7 +84,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 
 	s = subs.subtitles_at (dcp::Time (0, 0, 11, 95));
 	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -101,7 +102,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 
 	s = subs.subtitles_at (dcp::Time (0, 0, 14, 42));
 	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -121,11 +122,11 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 /** And similarly for another one */
 BOOST_AUTO_TEST_CASE (subtitles2)
 {
-	dcp::SubtitleAsset subs ("test/data/subs2.xml");
+	dcp::SubtitleContent subs ("test/data/subs2.xml");
 
-	list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_at (dcp::Time (0, 0, 42, 100));
+	list<shared_ptr<dcp::SubtitleString> > s = subs.subtitles_at (dcp::Time (0, 0, 42, 100));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -140,7 +141,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -158,7 +159,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 0, 50, 50));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -173,7 +174,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -191,7 +192,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 2, 300));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -206,7 +207,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -224,7 +225,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 15, 50));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -239,7 +240,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -257,7 +258,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 27, 200));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -272,7 +273,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -290,7 +291,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 42, 300));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -305,7 +306,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -323,7 +324,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 45, 200));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -338,7 +339,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -356,7 +357,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 1, 47, 249));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -371,7 +372,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   false,
 				   dcp::Color (255, 255, 255),
@@ -389,7 +390,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 
 	s = subs.subtitles_at (dcp::Time (0, 2, 6, 210));
 	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.front().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
@@ -404,7 +405,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::Subtitle (
+	BOOST_CHECK_EQUAL (*(s.back().get()), dcp::SubtitleString (
 				   "Arial",
 				   true,
 				   dcp::Color (255, 255, 255),
diff --git a/test/test.cc b/test/test.cc
index ff018cd5..f30a9db8 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -49,17 +49,3 @@ wav (dcp::Channel)
 
 string test_corpus = "../libdcp-test";
 
-TestFile::TestFile (boost::filesystem::path file)
-{
-	_size = boost::filesystem::file_size (file);
-	_data = new uint8_t[_size];
-	FILE* f = dcp::fopen_boost (file, "r");
-	assert (f);
-	fread (_data, 1, _size, f);
-	fclose (f);
-}
-
-TestFile::~TestFile ()
-{
-	delete[] _data;
-}
diff --git a/test/test.h b/test/test.h
index 31b4bf0a..bc6baccd 100644
--- a/test/test.h
+++ b/test/test.h
@@ -18,22 +18,3 @@
 */
 
 extern std::string test_corpus;
-
-class TestFile
-{
-public:
-	TestFile (boost::filesystem::path file);
-	~TestFile ();
-	
-	uint8_t* data () const {
-		return _data;
-	}
-
-	int64_t size () const {
-		return _size;
-	}
-
-private:
-	uint8_t* _data;
-	int64_t _size;
-};
diff --git a/test/wscript b/test/wscript
index b2b1b038..0cc0e202 100644
--- a/test/wscript
+++ b/test/wscript
@@ -25,7 +25,7 @@ def build(bld):
     obj.source = """
                  certificates_test.cc
                  color_test.cc
-                 cpl_sar.cc
+                 cpl_sar_test.cc
                  dcp_time_test.cc
                  decryption_test.cc
                  frame_info_test.cc