X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Faudio_dialog.cc;h=efc506aff9a62bdec61946882308950c84fb3259;hb=08f96200aacf9f91ef3e3f5b80224a5b2437f279;hp=f3f7c1f8ced0797c21d9dd3a9595eb9b1dc4e6b5;hpb=4df42c81390ed61aecbcc5bf0ad380937c26eaef;p=dcpomatic.git

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index f3f7c1f8c..efc506aff 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.
@@ -88,6 +89,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 	left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 	_loudness_range = new StaticText (this, wxT (""));
 	left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
+	_leqm = new StaticText (this, wxT(""));
+	left->Add (_leqm, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 
 	lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12);
 
@@ -99,17 +102,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 +151,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 +215,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 +298,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)
 {
@@ -344,7 +368,7 @@ AudioDialog::setup_statistics ()
 	}
 
 	pair<AudioAnalysis::PeakTime, int> const peak = _analysis->overall_sample_peak ();
-	float const peak_dB = 20 * log10 (peak.first.peak) + _analysis->gain_correction (_playlist);
+	float const peak_dB = linear_to_db(peak.first.peak) + _analysis->gain_correction(_playlist);
 	_sample_peak->SetLabel (
 		wxString::Format (
 			_("Sample peak is %.2fdB at %s on %s"),
@@ -362,7 +386,7 @@ AudioDialog::setup_statistics ()
 
 	if (_analysis->overall_true_peak()) {
 		float const peak = _analysis->overall_true_peak().get();
-		float const peak_dB = 20 * log10 (peak) + _analysis->gain_correction (_playlist);
+		float const peak_dB = linear_to_db(peak) + _analysis->gain_correction(_playlist);
 
 		_true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB));
 
@@ -392,6 +416,14 @@ AudioDialog::setup_statistics ()
 				)
 			);
 	}
+
+	if (static_cast<bool>(_analysis->leqm())) {
+		_leqm->SetLabel(
+			wxString::Format(
+				_("LEQ(m) %.2fdB"), _analysis->leqm().get() + _analysis->gain_correction(_playlist)
+				)
+			);
+	}
 }
 
 bool