X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fburnt_subtitle_test.cc;h=71758e01251d60cfb4fead5e3ba8c25fb6b5f6fd;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hp=d10d1ed25239e54dac342c0bce6bcef40d0a94d6;hpb=7b2054e2a73844450b5b55c5788c02af671812ce;p=dcpomatic.git

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index d10d1ed25..71758e012 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -22,12 +23,13 @@
  */
 
 #include <boost/test/unit_test.hpp>
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "test.h"
+#include <iostream>
 
 using std::cout;
 using boost::shared_ptr;
@@ -39,10 +41,10 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	film->set_burn_subtitles (true);
-	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
+	shared_ptr<TextSubtitleContent> content = make_shared<TextSubtitleContent> (film, "test/data/subrip2.srt");
 	content->set_use_subtitles (true);
-	film->examine_and_add_content (content);
+	content->set_burn_subtitles (true);
+	film->examine_and_add_content (content, true);
 	wait_for_jobs ();
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -58,9 +60,9 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 	film->set_burn_subtitles (true);
-	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml"));
+	shared_ptr<DCPSubtitleContent> content = make_shared<DCPSubtitleContent> (film, "test/data/dcp_sub.xml");
 	content->set_use_subtitles (true);
-	film->examine_and_add_content (content);
+	film->examine_and_add_content (content, true);
 	wait_for_jobs ();
 	film->make_dcp ();
 	wait_for_jobs ();