X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=c4a14a58b3a118bec1c36c4356aea4a1d1c84632;hb=4e62980064496060af5a8c6ecab26ddf218aa63a;hp=b938ed87dd83322b096bd47a809641bf10bc41ff;hpb=b0bec103eaaebfbc0b6f90f9b3e7ac8c32f2707e;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index b938ed87d..c4a14a58b 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -455,6 +455,16 @@ DCPPanel::film_changed (int p)
 	case Film::USE_ISDCF_NAME:
 	{
 		checked_set (_use_isdcf_name, _film->use_isdcf_name ());
+		if (_film->use_isdcf_name()) {
+			/* We are going back to using an ISDCF name.  Remove anything after a _ in the current name,
+			   in case the user has clicked 'Copy as name' then re-ticked 'Use ISDCF name' (#1513).
+			*/
+			string const name = _film->name ();
+			string::size_type const u = name.find("_");
+			if (u != string::npos) {
+				_film->set_name (name.substr(0, u));
+			}
+		}
 		setup_dcp_name ();
 		_edit_isdcf_button->Enable (_film->use_isdcf_name ());
 		break;
@@ -773,6 +783,12 @@ DCPPanel::config_changed (Config::Property p)
 		_audio_grid->Clear ();
 		add_audio_panel_to_grid ();
 		_audio_grid->Layout ();
+	} else if (p == Config::SHOW_EXPERIMENTAL_AUDIO_PROCESSORS) {
+		_audio_processor->Clear ();
+		add_audio_processors ();
+		if (_film) {
+			film_changed (Film::AUDIO_PROCESSOR);
+		}
 	}
 }
 
@@ -921,10 +937,10 @@ wxPanel *
 DCPPanel::make_audio_panel ()
 {
 	wxPanel* panel = new wxPanel (_notebook);
-	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	_audio_panel_sizer = new wxBoxSizer (wxVERTICAL);
 	_audio_grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	sizer->Add (_audio_grid, 0, wxALL, 8);
-	panel->SetSizer (sizer);
+	_audio_panel_sizer->Add (_audio_grid, 0, wxALL, 8);
+	panel->SetSizer (_audio_panel_sizer);
 
 	_channels_label = create_label (panel, _("Channels"), true);
 	_audio_channels = new wxChoice (panel, wxID_ANY);
@@ -932,10 +948,7 @@ DCPPanel::make_audio_panel ()
 
 	_processor_label = create_label (panel, _("Processor"), true);
 	_audio_processor = new wxChoice (panel, wxID_ANY);
-	_audio_processor->Append (_("None"), new wxStringClientData (N_("none")));
-	BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::all ()) {
-		_audio_processor->Append (std_to_wx (ap->name ()), new wxStringClientData (std_to_wx (ap->id ())));
-	}
+	add_audio_processors ();
 
 	_show_audio = new Button (panel, _("Show audio..."));
 
@@ -1030,3 +1043,13 @@ DCPPanel::reel_length_changed ()
 
 	_film->set_reel_length (_reel_length->GetValue() * 1000000000LL);
 }
+
+void
+DCPPanel::add_audio_processors ()
+{
+	_audio_processor->Append (_("None"), new wxStringClientData (N_("none")));
+	BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::visible()) {
+		_audio_processor->Append (std_to_wx(ap->name()), new wxStringClientData(std_to_wx(ap->id())));
+	}
+	_audio_panel_sizer->Layout();
+}