Rename some stuff Content -> Asset.

7 files changed, 15 insertions, 16 deletions

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 5bedf5f6..6da30ffe 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 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
@@ -25,7 +25,6 @@
 #include "picture_mxf_writer.h"
 #include "sound_mxf_writer.h"
 #include "sound_mxf.h"
-#include "subtitle_content.h"
 #include "reel.h"
 #include "test.h"
 #include "file.h"
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 173ccf59..6dc37b8d 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -30,7 +30,7 @@
 #include "reel.h"
 #include "test.h"
 #include "file.h"
-#include "subtitle_content.h"
+#include "subtitle_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "encrypted_kdm.h"
diff --git a/test/read_subtitle_test.cc b/test/read_subtitle_test.cc
index 42bd2ee4..c49ddfdf 100644
--- a/test/read_subtitle_test.cc
+++ b/test/read_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -17,7 +17,7 @@
 
 */
 
-#include "interop_subtitle_content.h"
+#include "interop_subtitle_asset.h"
 #include "subtitle_string.h"
 #include <boost/test/unit_test.hpp>
 
@@ -28,7 +28,7 @@ using boost::shared_ptr;
 /* Load some subtitle content from XML and check that it is read correctly */
 BOOST_AUTO_TEST_CASE (read_subtitle_test1)
 {
-	dcp::InteropSubtitleContent subs ("test/data/subs1.xml");
+	dcp::InteropSubtitleAsset subs ("test/data/subs1.xml");
 
 	BOOST_CHECK_EQUAL (subs.language(), "French");
 
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test1)
 /** And similarly for another one */
 BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 {
-	dcp::InteropSubtitleContent subs ("test/data/subs2.xml");
+	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));
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index 1a3cfbff..e62b9169 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -21,7 +21,7 @@
 #include "dcp.h"
 #include "cpl.h"
 #include "reel.h"
-#include "subtitle_content.h"
+#include "subtitle_asset.h"
 #include "reel_subtitle_asset.h"
 #include "exceptions.h"
 
@@ -51,7 +51,7 @@ main (int argc, char* argv[])
 			for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
 				
 				if ((*j)->main_subtitle()) {
-					(*j)->main_subtitle()->subtitle_content()->write_xml ((*j)->main_subtitle()->subtitle_content()->file ());
+					(*j)->main_subtitle()->subtitle_asset()->write_xml ((*j)->main_subtitle()->subtitle_asset()->file ());
 				}
 			}
 		}
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 74bfa7a2..2b68de3d 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -17,14 +17,14 @@
 
 */
 
-#include "smpte_subtitle_content.h"
+#include "smpte_subtitle_asset.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
 /** Load a SMPTE XML subtitle file */
 BOOST_AUTO_TEST_CASE (smpte_subtitle_test)
 {
-	dcp::SMPTESubtitleContent sc (private_test / "8dfafe11-2bd1-4206-818b-afc109cfe7f6_reel1.xml", false);
+	dcp::SMPTESubtitleAsset sc (private_test / "8dfafe11-2bd1-4206-818b-afc109cfe7f6_reel1.xml", false);
 
 	BOOST_REQUIRE_EQUAL (sc.id(), "8dfafe11-2bd1-4206-818b-afc109cfe7f6");
 	BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 159);
diff --git a/test/subs_in_out.cc b/test/subs_in_out.cc
index e5d6c19c..2a662262 100644
--- a/test/subs_in_out.cc
+++ b/test/subs_in_out.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -17,7 +17,7 @@
 
 */
 
-#include "interop_subtitle_content.h"
+#include "interop_subtitle_asset.h"
 #include <iostream>
 
 using namespace std;
@@ -29,7 +29,7 @@ int main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 	
-	dcp::InteropSubtitleContent s (argv[1]);
+	dcp::InteropSubtitleAsset s (argv[1]);
 	cout << s.xml_as_string ();
 	return 0;
 }
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index 1a6f96bd..b02a6e59 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "interop_subtitle_content.h"
+#include "interop_subtitle_asset.h"
 #include "subtitle_string.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 /* Write some subtitle content as Interop XML and check that it is right */
 BOOST_AUTO_TEST_CASE (write_subtitle_test)
 {
-	dcp::InteropSubtitleContent c ("Test", "EN");
+	dcp::InteropSubtitleAsset c ("Test", "EN");
 
 	c.add (
 		dcp::SubtitleString (