X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_dialog.cc;h=9b3a9376937d4c4c94cf9ec601c4d9613055c48f;hb=3044ef060894c62e8a1cef15ad14078001093982;hp=81687ca809942ecb00a67a209b71180ba94fda38;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 81687ca80..9b3a93769 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -42,6 +42,7 @@ using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** @param parent Parent window.
  *  @param film Film we are using.
@@ -99,17 +100,13 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 		right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
 	}
 
-	for (int i = 0; i < _channels; ++i) {
+	for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
 		_channel_checkbox[i] = new CheckBox (this, std_to_wx(audio_channel_name(i)));
 		_channel_checkbox[i]->SetForegroundColour(wxColour(_plot->colour(i)));
 		right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
 		_channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1));
 	}
 
-	for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
-		_channel_checkbox[i] = 0;
-	}
-
 	{
 		wxStaticText* m = new StaticText (this, _("Type"));
 		m->SetFont (subheading_font);
@@ -152,7 +149,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
 
-	_film_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
+	_film_connection = film->Change.connect (boost::bind(&AudioDialog::film_change, this, _1, _2));
+	_film_content_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
 	DCPOMATIC_ASSERT (film->directory());
 	SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string())));
 
@@ -182,6 +180,13 @@ AudioDialog::try_to_load_analysis ()
 	if (!boost::filesystem::exists (path)) {
 		_plot->set_analysis (shared_ptr<AudioAnalysis> ());
 		_analysis.reset ();
+
+		BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+			if (dynamic_pointer_cast<AnalyseAudioJob>(i)) {
+				i->cancel ();
+			}
+		}
+
 		JobManager::instance()->analyse_audio (
 			film, _playlist, !static_cast<bool>(check), _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)
 			);
@@ -208,6 +213,14 @@ AudioDialog::try_to_load_analysis ()
 	_plot->set_gain_correction (_analysis->gain_correction (_playlist));
 	setup_statistics ();
 
+	for (int i = 0; i < _channels; ++i) {
+		_channel_checkbox[i]->Show ();
+	}
+
+	for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+		_channel_checkbox[i]->Hide ();
+	}
+
 	/* Set up some defaults if no check boxes are checked */
 
 	int i = 0;
@@ -283,6 +296,22 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 	_plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
 
+void
+AudioDialog::film_change (ChangeType type, int p)
+{
+	if (type != CHANGE_TYPE_DONE) {
+		return;
+	}
+
+	if (p == Film::AUDIO_CHANNELS) {
+		shared_ptr<Film> film = _film.lock ();
+		if (film) {
+			_channels = film->audio_channels ();
+			try_to_load_analysis ();
+		}
+	}
+}
+
 void
 AudioDialog::content_change (ChangeType type, int p)
 {