Make player decide whether subtitles should be burnt based on

content settings rather than using the film's settings.  Remove
film property of burn-subtitles.

7 files changed, 6 insertions, 7 deletions

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 9bb772f4a..f861370b4 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -39,9 +39,9 @@ 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"));
 	content->set_use_subtitles (true);
+	content->set_burn_subtitles (true);
 	film->examine_and_add_content (content, true);
 	wait_for_jobs ();
 	film->make_dcp ();
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index e97abcec5..99cc845bc 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -103,7 +103,6 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			24,
 			200000000,
 			RESOLUTION_2K,
-			true,
 			log
 			)
 		);
@@ -185,7 +184,6 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			24,
 			200000000,
 			RESOLUTION_2K,
-			true,
 			log
 			)
 		);
diff --git a/test/data b/test/data
-Subproject f3a8fc2ba88126db06aa3c9dd5eb5110fb2de67
+Subproject c710f266d188cd7b933506b2973c97b967f3332
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 314b214f2..e8a5a4c04 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -38,7 +38,6 @@ BOOST_AUTO_TEST_CASE (dcp_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_burn_subtitles (false);
 	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
@@ -46,6 +45,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
 
 	content->set_use_subtitles (true);
+	content->set_burn_subtitles (false);
 	film->make_dcp ();
 	wait_for_jobs ();
 
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 64249a118..161d23d77 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -37,12 +37,12 @@ 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_burn_subtitles (false);
 	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.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 ();
 
@@ -57,12 +57,12 @@ 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_burn_subtitles (false);
 	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
 	content->set_use_subtitles (true);
+	content->set_burn_subtitles (false);
 	/* Use test/data/subrip2.srt as if it were a font file  */
 	content->fonts().front()->set_file ("test/data/subrip2.srt");
 
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index f4f21486c..296ffbdf8 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -32,6 +32,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 
 	string const xml = "<Content>"
 		"<Type>FFmpeg</Type>"
+		"<BurnSubtitles>0</BurnSubtitles>"
 		"<Path>/home/c.hetherington/DCP/clapperboard.mp4</Path>"
 		"<Digest>2760e03c7251480f7f02c01a907792673784335</Digest>"
 		"<Position>0</Position>"
diff --git a/test/xml_subtitle_test.cc b/test/xml_subtitle_test.cc
index 8f44fa722..536cb7d46 100644
--- a/test/xml_subtitle_test.cc
+++ b/test/xml_subtitle_test.cc
@@ -38,9 +38,9 @@ BOOST_AUTO_TEST_CASE (xml_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_burn_subtitles (false);
 	shared_ptr<SubRipContent> content (new SubRipContent (film, "test/data/subrip2.srt"));
 	content->set_use_subtitles (true);
+	content->set_burn_subtitles (false);
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 	film->make_dcp ();