X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=d066c11e25dd55aa7eae73d24f4e8b9f121b0bb0;hp=ba2a12e9fb6359a175172d403b3c911b4519caf9;hb=886e0f9d08a241bef5baf328beb08a0d6996ae14;hpb=0bab9b203ccd49c6d7a4536f1bbdb740f49ba65f

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index ba2a12e9f..d066c11e2 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -88,7 +88,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
 	_delay_ms_label = create_label (this, _("ms"), false);
 
-	_mapping = new AudioMappingView (this);
+	_mapping = new AudioMappingView (this, _("Content"), _("content"), _("DCP"), _("DCP"));
 	_sizer->Add (_mapping, 1, wxEXPAND | wxALL, 6);
 
 	_description = new StaticText (this, wxT(" \n"), wxDefaultPosition, wxDefaultSize);
@@ -177,6 +177,10 @@ AudioPanel::~AudioPanel ()
 void
 AudioPanel::film_changed (Film::Property property)
 {
+	if (!_parent->film()) {
+		return;
+	}
+
 	switch (property) {
 	case Film::AUDIO_CHANNELS:
 	case Film::AUDIO_PROCESSOR:
@@ -247,18 +251,14 @@ AudioPanel::gain_calculate_button_clicked ()
 {
 	GainCalculatorDialog* d = new GainCalculatorDialog (this);
 	int const r = d->ShowModal ();
+	optional<float> c = d->db_change();
 
-	if (r == wxID_CANCEL || d->wanted_fader() == 0 || d->actual_fader() == 0) {
+	if (r == wxID_CANCEL || !c) {
 		d->Destroy ();
 		return;
 	}
 
-	_gain->wrapped()->SetValue (
-		Config::instance()->cinema_sound_processor()->db_for_fader_change (
-			d->wanted_fader (),
-			d->actual_fader ()
-			)
-		);
+	_gain->wrapped()->SetValue (*c);
 
 	/* This appears to be necessary, as the change is not signalled,
 	   I think.
@@ -316,7 +316,13 @@ AudioPanel::setup_sensitivity ()
 
 	string why_not;
 	bool const can_reference = dcp && dcp->can_reference_audio (_parent->film(), why_not);
-	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
+	wxString cannot;
+	if (why_not.empty()) {
+		cannot = _("Cannot reference this DCP's audio.");
+	} else {
+		cannot = _("Cannot reference this DCP's audio: ") + std_to_wx(why_not);
+	}
+	setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot);
 
 	if (_reference->GetValue ()) {
 		_gain->wrapped()->Enable (false);