X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=0c70d4b3efc3d12c092dddda5ab72be55e970b58;hp=de215a0d294298a484f6407715ef7d9bb9b55933;hb=74fe68e5895654e27a7cf8097917c1e95fa89519;hpb=7d93aa13507094e87bc9086986b36edd96a613b0

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index de215a0d2..0c70d4b3e 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -439,9 +439,6 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_name, _film->name());
 		setup_dcp_name ();
 		break;
-	case Film::WITH_SUBTITLES:
-		setup_dcp_name ();
-		break;
 	case Film::DCP_CONTENT_TYPE:
 		checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
 		setup_dcp_name ();
@@ -528,7 +525,7 @@ FilmEditor::film_content_changed (int property)
 		(*i)->film_content_changed (property);
 	}
 
-	if (property == FFmpegContentProperty::AUDIO_STREAM) {
+	if (property == FFmpegContentProperty::AUDIO_STREAM || property == SubtitleContentProperty::SUBTITLE_USE) {
 		setup_dcp_name ();
 	} else if (property == ContentProperty::PATH) {
 		setup_content ();
@@ -617,7 +614,6 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::CONTAINER);
 	film_changed (Film::RESOLUTION);
 	film_changed (Film::SCALER);
-	film_changed (Film::WITH_SUBTITLES);
 	film_changed (Film::SIGNED);
 	film_changed (Film::ENCRYPTED);
 	film_changed (Film::J2K_BANDWIDTH);
@@ -871,7 +867,7 @@ FilmEditor::setup_content_sensitivity ()
 
 	_video_panel->Enable	(video_selection.size() > 0 && _generally_sensitive);
 	_audio_panel->Enable	(audio_selection.size() > 0 && _generally_sensitive);
-	_subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast<FFmpegContent> (selection.front()) && _generally_sensitive);
+	_subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast<SubtitleContent> (selection.front()) && _generally_sensitive);
 	_timing_panel->Enable	(selection.size() == 1 && _generally_sensitive);
 }