X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=88eae5141b66f5f9dba363da59f46f015be5cf9e;hb=6b9bda07984837d188064f3f5514d0aa132655ec;hp=cda38eaf69ae4fef6d7abcd9b3774d18d596ad93;hpb=86815157be975d143b9e1bdbcb777303d105bcb8;p=dcpomatic.git

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index cda38eaf6..88eae5141 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -48,15 +48,26 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	: ContentSubPanel (p, _("Audio"))
 	, _audio_dialog (0)
 {
+	wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+
+	_reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's audio as OV and make VF"));
+	reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP);
+
+	_reference_note = new wxStaticText (this, wxID_ANY, _(""));
+	_reference_note->Wrap (200);
+	reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+	wxFont font = _reference_note->GetFont();
+	font.SetStyle(wxFONTSTYLE_ITALIC);
+	font.SetPointSize(font.GetPointSize() - 1);
+	_reference_note->SetFont(font);
+
+	_sizer->Add (reference_sizer);
+
 	wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	_sizer->Add (grid, 0, wxALL, 8);
 
 	int r = 0;
 
-	_reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP"));
-	grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
-
 	_show = new wxButton (this, wxID_ANY, _("Show graph of audio levels..."));
 	grid->Add (_show, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	_peak = new wxStaticText (this, wxID_ANY, wxT (""));
@@ -100,9 +111,6 @@ AudioPanel::AudioPanel (ContentPanel* p)
 
 	_description = new wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize);
 	_sizer->Add (_description, 0, wxALL, 12);
-	wxFont font = _description->GetFont();
-	font.SetStyle (wxFONTSTYLE_ITALIC);
-	font.SetPointSize (font.GetPointSize() - 1);
 	_description->SetFont (font);
 	++r;
 
@@ -111,13 +119,13 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	_gain->wrapped()->SetIncrement (0.5);
 	_delay->wrapped()->SetRange (-1000, 1000);
 
-	_reference->Bind             (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioPanel::reference_clicked, this));
-	_show->Bind                  (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&AudioPanel::show_clicked, this));
-	_gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
+	_reference->Bind             (wxEVT_CHECKBOX, boost::bind (&AudioPanel::reference_clicked, this));
+	_show->Bind                  (wxEVT_BUTTON,   boost::bind (&AudioPanel::show_clicked, this));
+	_gain_calculate_button->Bind (wxEVT_BUTTON,   boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
 
 	_mapping_connection = _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
 
-	JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1));
+	JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&AudioPanel::active_jobs_changed, this, _1, _2));
 }
 
 AudioPanel::~AudioPanel ()
@@ -267,9 +275,9 @@ AudioPanel::setup_sensitivity ()
 		dcp = dynamic_pointer_cast<DCPContent> (sel.front ());
 	}
 
-	list<string> why_not;
+	string why_not;
 	bool const can_reference = dcp && dcp->can_reference_audio (why_not);
-	setup_refer_button (_reference, dcp, can_reference, why_not);
+	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
 	if (_reference->GetValue ()) {
 		_gain->wrapped()->Enable (false);
@@ -311,7 +319,7 @@ void
 AudioPanel::setup_peak ()
 {
 	ContentList sel = _parent->selected_audio ();
-	bool alert = false;
+	optional<float> peak_dB;
 
 	if (sel.size() != 1) {
 		_peak->SetLabel (wxT (""));
@@ -320,15 +328,8 @@ AudioPanel::setup_peak ()
 		playlist->add (sel.front ());
 		try {
 			shared_ptr<AudioAnalysis> analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist)));
-			if (analysis->sample_peak ()) {
-				float const peak_dB = 20 * log10 (analysis->sample_peak().get()) + analysis->gain_correction (playlist);
-				if (peak_dB > -3) {
-					alert = true;
-				}
-				_peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), peak_dB));
-			} else {
-				_peak->SetLabel (_("Peak: unknown"));
-			}
+			peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist);
+			_peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), *peak_dB));
 		} catch (...) {
 			_peak->SetLabel (_("Peak: unknown"));
 		}
@@ -336,18 +337,23 @@ AudioPanel::setup_peak ()
 
 	static wxColour normal = _peak->GetForegroundColour ();
 
-	if (alert) {
+	if (peak_dB && *peak_dB > -0.5) {
 		_peak->SetForegroundColour (wxColour (255, 0, 0));
+	} else if (peak_dB && *peak_dB > -3) {
+		_peak->SetForegroundColour (wxColour (186, 120, 0));
 	} else {
 		_peak->SetForegroundColour (normal);
 	}
 }
 
 void
-AudioPanel::active_jobs_changed (optional<string> j)
+AudioPanel::active_jobs_changed (optional<string> old_active, optional<string> new_active)
 {
-	if (j && *j == "analyse_audio") {
+	if (old_active && *old_active == "analyse_audio") {
 		setup_peak ();
+		_mapping->Enable (true);
+	} else if (new_active && *new_active == "analyse_audio") {
+		_mapping->Enable (false);
 	}
 }