X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=d29a91ed2b60ba6818745800bb0611bdbffb91f9;hb=55861a0b4ad4270f80b8d1ae10230cf2ebb25735;hp=772efd642585968bc75122c346f20c3ac981cc1d;hpb=b2a89d8d2601ae0eb0e63fa40c999994397fdfe5;p=dcpomatic.git

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 772efd642..d29a91ed2 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -1,24 +1,25 @@
 /*
     Copyright (C) 2015 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/>.
 
 */
 
-/** @file  test/subtitle_write_test.cc
- *  @brief Test writing DCPs with XML subtitles.
+/** @file  test/srt_subtitle_test.cc
+ *  @brief Test writing DCPs with subtitles from .srt.
  */
 
 #include "lib/film.h"
@@ -26,6 +27,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
+#include "lib/subtitle_content.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
@@ -42,12 +44,13 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
+	film->set_audio_channels (6);
 	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	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 ();
 
@@ -62,14 +65,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
+	film->set_audio_channels (6);
 	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	content->set_use_subtitles (true);
-	content->set_burn_subtitles (false);
+	content->subtitle->set_use (true);
+	content->subtitle->set_burn (false);
 	/* Use test/data/subrip2.srt as if it were a font file  */
-	content->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
+	content->subtitle->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
 
 	film->make_dcp ();
 	wait_for_jobs ();
@@ -78,25 +82,9 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 	check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
 }
 
-/** Make another DCP with a longer .srt file */
-BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
+static void
+check_subtitle_file (shared_ptr<Film> film, boost::filesystem::path ref)
 {
-	shared_ptr<Film> film = new_test_film ("srt_subtitle_test3");
-
-	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
-	film->set_name ("frobozz");
-	film->set_interop (true);
-	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, private_data / "Ankoemmling.srt"));
-	film->examine_and_add_content (content);
-	wait_for_jobs ();
-
-	content->set_use_subtitles (true);
-	content->set_burn_subtitles (false);
-
-	film->make_dcp ();
-	wait_for_jobs ();
-
 	/* Find the subtitle file and check it */
 	for (
 		boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory() / film->dcp_name (false));
@@ -112,15 +100,37 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 				if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
 					list<string> ignore;
 					ignore.push_back ("SubtitleID");
-					check_xml (*j, private_data / "Ankoemmling.xml", ignore);
+					check_xml (*j, ref, ignore);
 				}
 			}
 		}
 	}
 }
 
-#if 0
+/** Make another DCP with a longer .srt file */
+BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
+{
+	shared_ptr<Film> film = new_test_film ("srt_subtitle_test3");
+
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+	film->set_name ("frobozz");
+	film->set_interop (true);
+	film->set_audio_channels (6);
+	shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, private_data / "Ankoemmling.srt"));
+	film->examine_and_add_content (content);
+	wait_for_jobs ();
+
+	content->subtitle->set_use (true);
+	content->subtitle->set_burn (false);
 
+	film->make_dcp ();
+	wait_for_jobs ();
+
+	check_subtitle_file (film, private_data / "Ankoemmling.xml");
+}
+
+#if 0
 /* XXX: this is disabled; there is some difference in font rendering
    between the test machine and others.
 */