Switch subtitle string font specs to be the font ID; split SubtitleContent into Interop and SMPTE.

1 files changed, 21 insertions, 2 deletions

diff --git a/test/subs_in_out.cc b/test/subs_in_out.cc
index f3f4baf9..e5d6c19c 100644
--- a/test/subs_in_out.cc
+++ b/test/subs_in_out.cc
@@ -1,5 +1,24 @@
+/*
+    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 "interop_subtitle_content.h"
 #include <iostream>
-#include "subtitle_content.h"
 
 using namespace std;
 
@@ -10,7 +29,7 @@ int main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 	
-	dcp::SubtitleContent s (argv[1], false);
+	dcp::InteropSubtitleContent s (argv[1]);
 	cout << s.xml_as_string ();
 	return 0;
 }