From: Carl Hetherington <cth@carlh.net>
Date: Tue, 8 Jan 2019 23:48:48 +0000 (+0000)
Subject: Re-analyse audio when DCP channel count changes (#1189).
X-Git-Tag: v2.13.96~8
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=bd68f5a27795cb9151633bac810c53bae4ec4bf4

Re-analyse audio when DCP channel count changes (#1189).
---

diff --git a/ChangeLog b/ChangeLog
index 9884e9936..df09bce5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2019-01-08  Carl Hetherington  <cth@carlh.net>
 
+	* Re-analyse audio when DCP channel count changes (#1189).
+
 	* Fix failure to re-analyse audio when the channel map changes (#1257).
 
 2019-01-06  Carl Hetherington  <cth@carlh.net>
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 029cfe620..8080b9921 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -288,6 +288,8 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
 		digester.add (audio_processor()->id ());
 	}
 
+	digester.add (audio_channels());
+
 	p /= digester.get ();
 	return p;
 }
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index f3f7c1f8c..f4de9cd1a 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -99,17 +99,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 +148,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())));
 
@@ -215,6 +212,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;
@@ -290,6 +295,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)
 {
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 2c077c9d1..38f474afd 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -38,6 +38,7 @@ public:
 	void set_cursor (boost::optional<DCPTime> time, boost::optional<float> db);
 
 private:
+	void film_change (ChangeType, int);
 	void content_change (ChangeType, int);
 	void channel_clicked (wxCommandEvent &);
 	void type_clicked (wxCommandEvent &);
@@ -61,5 +62,6 @@ private:
 	wxCheckBox* _type_checkbox[AudioPoint::COUNT];
 	wxSlider* _smoothing;
 	boost::signals2::scoped_connection _film_connection;
+	boost::signals2::scoped_connection _film_content_connection;
 	boost::signals2::scoped_connection _analysis_finished_connection;
 };