X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=27dd87bbf940d416ae4e508f2b16563a02265549;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hp=9007ad6114ac2ce418121019fbb7be17f119aa63;hpb=3bb6308d1b17aa643021bddc82e954029076f780;p=dcpomatic.git

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 9007ad611..27dd87bbf 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_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/>.
 
 */
 
@@ -28,7 +29,11 @@
 #include "lib/ratio.h"
 #include "lib/dcp_decoder.h"
 #include "lib/dcp_content_type.h"
+#include "lib/subtitle_content.h"
+#include "lib/content_subtitle.h"
+#include "lib/subtitle_decoder.h"
 #include "test.h"
+#include <iostream>
 
 using std::cout;
 using std::list;
@@ -45,10 +50,10 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
+	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(2).get());
 
-	content->set_use_subtitles (true);
-	content->set_burn_subtitles (false);
+	content->subtitle->set_use (true);
+	content->subtitle->set_burn (false);
 	film->make_dcp ();
 	wait_for_jobs ();
 
@@ -66,7 +71,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	shared_ptr<DCPDecoder> decoder (new DCPDecoder (content));
+	shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log()));
 
 	list<ContentTimePeriod> ctp = decoder->text_subtitles_during (
 		ContentTimePeriod (
@@ -77,16 +82,17 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 		);
 
 	BOOST_REQUIRE_EQUAL (ctp.size(), 2);
-	BOOST_CHECK_EQUAL (ctp.front().from, ContentTime::from_seconds (25 + 12 * 0.04));
-	BOOST_CHECK_EQUAL (ctp.front().to, ContentTime::from_seconds (26 + 4 * 0.04));
-	BOOST_CHECK_EQUAL (ctp.back().from, ContentTime::from_seconds (25 + 12 * 0.04));
-	BOOST_CHECK_EQUAL (ctp.back().to, ContentTime::from_seconds (26 + 4 * 0.04));
+	BOOST_CHECK_EQUAL (ctp.front().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get());
+	BOOST_CHECK_EQUAL (ctp.front().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get());
+	BOOST_CHECK_EQUAL (ctp.back().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get());
+	BOOST_CHECK_EQUAL (ctp.back().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get());
 
-	list<ContentTextSubtitle> subs = decoder->get_text_subtitles (
+	list<ContentTextSubtitle> subs = decoder->subtitle->get_text (
 		ContentTimePeriod (
 			ContentTime::from_seconds (25),
 			ContentTime::from_seconds (26)
 			),
+		true,
 		true
 		);