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.

3 files changed, 3 insertions, 25 deletions

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 0f5ec5afc..b38476dd7 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -197,16 +197,6 @@ DCPPanel::signed_toggled ()
 }
 
 void
-DCPPanel::burn_subtitles_toggled ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_burn_subtitles (_burn_subtitles->GetValue ());
-}
-
-void
 DCPPanel::encrypted_toggled ()
 {
 	if (!_film) {
@@ -289,9 +279,6 @@ DCPPanel::film_changed (int p)
 		checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
 		setup_dcp_name ();
 		break;
-	case Film::BURN_SUBTITLES:
-		checked_set (_burn_subtitles, _film->burn_subtitles ());
-		break;
 	case Film::SIGNED:
 		checked_set (_signed, _film->is_signed ());
 		break;
@@ -455,7 +442,6 @@ DCPPanel::set_film (shared_ptr<Film> film)
 	film_changed (Film::CONTAINER);
 	film_changed (Film::RESOLUTION);
 	film_changed (Film::SIGNED);
-	film_changed (Film::BURN_SUBTITLES);
 	film_changed (Film::ENCRYPTED);
 	film_changed (Film::KEY);
 	film_changed (Film::J2K_BANDWIDTH);
@@ -481,7 +467,6 @@ DCPPanel::set_general_sensitivity (bool s)
 	if (_film && _film->encrypted ()) {
 		si = false;
 	}
-	_burn_subtitles->Enable (s);
 	_signed->Enable (si);
 
 	_encrypted->Enable (s);
@@ -605,10 +590,6 @@ DCPPanel::make_video_panel ()
 		++r;
 	}
 
-	_burn_subtitles = new wxCheckBox (panel, wxID_ANY, _("Burn subtitles into image"));
-	grid->Add (_burn_subtitles, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
-
 	_three_d = new wxCheckBox (panel, wxID_ANY, _("3D"));
 	grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
@@ -632,7 +613,6 @@ DCPPanel::make_video_panel ()
 	_frame_rate_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&DCPPanel::frame_rate_choice_changed, this));
 	_frame_rate_spin->Bind  (wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&DCPPanel::frame_rate_spin_changed, this));
 	_best_frame_rate->Bind	(wxEVT_COMMAND_BUTTON_CLICKED,	      boost::bind (&DCPPanel::best_frame_rate_clicked, this));
-	_burn_subtitles->Bind   (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::burn_subtitles_toggled, this));
 	_j2k_bandwidth->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
 	/* Also listen to wxEVT_COMMAND_TEXT_UPDATED so that typing numbers directly in is always noticed */
 	_j2k_bandwidth->Bind	(wxEVT_COMMAND_TEXT_UPDATED,          boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 055de67a6..a81af4f45 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -67,7 +67,6 @@ private:
 	void three_d_changed ();
 	void standard_changed ();
 	void signed_toggled ();
-	void burn_subtitles_toggled ();
 	void encrypted_toggled ();
 	void edit_key_clicked ();
 	void audio_processor_changed ();
@@ -110,7 +109,6 @@ private:
 	wxChoice* _resolution;
 	wxChoice* _standard;
 	wxCheckBox* _signed;
-	wxCheckBox* _burn_subtitles;
 	wxCheckBox* _encrypted;
 	wxStaticText* _key;
 	wxButton* _edit_key;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 4e155e05d..7a306de62 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -145,10 +145,10 @@ FilmViewer::set_film (shared_ptr<Film> film)
 		return;
 	}
 
-	/* Always burn in subtitles, even if we are set not to, otherwise we won't see them
+	/* Always burn in subtitles, even if content is set not to, otherwise we won't see them
 	   in the preview.
 	*/
-	_player->set_burn_subtitles (true);
+	_player->set_always_burn_subtitles (true);
 
 	_film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
@@ -183,7 +183,7 @@ FilmViewer::get (DCPTime p, bool accurate)
 
 	if (!pvf.empty ()) {
 		try {
-			_frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
+			_frame = pvf.front()->image (PIX_FMT_RGB24, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
 
 			dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
 			if (pvf.front()->colour_conversion()) {