X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=183a3d4b9817ca8cfe89425e583eb69966f2cbcc;hb=e0b2ef3dbac6fc4900cad6fea4395c212578602b;hp=38504eacf15e1b6472dcd5be499c17fbcd552567;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 38504eacf..183a3d4b9 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,6 +24,9 @@
 #include "gain_calculator_dialog.h"
 #include "content_panel.h"
 #include "audio_dialog.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
 #include "lib/config.h"
 #include "lib/ffmpeg_audio_stream.h"
 #include "lib/ffmpeg_content.h"
@@ -48,16 +51,16 @@ AudioPanel::AudioPanel (ContentPanel* p)
 	: ContentSubPanel (p, _("Audio"))
 	, _audio_dialog (0)
 {
-	_reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's audio as OV and make VF"));
-	_reference_note = new wxStaticText (this, wxID_ANY, wxT(""));
+	_reference = new CheckBox (this, _("Use this DCP's audio as OV and make VF"));
+	_reference_note = new StaticText (this, wxT(""));
 	_reference_note->Wrap (200);
 	wxFont font = _reference_note->GetFont();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
 	font.SetPointSize(font.GetPointSize() - 1);
 	_reference_note->SetFont(font);
 
-	_show = new wxButton (this, wxID_ANY, _("Show graph of audio levels..."));
-	_peak = new wxStaticText (this, wxID_ANY, wxT (""));
+	_show = new Button (this, _("Show graph of audio levels..."));
+	_peak = new StaticText (this, wxT (""));
 
 	_gain_label = create_label (this, _("Gain"), true);
 	_gain = new ContentSpinCtrlDouble<AudioContent> (
@@ -70,7 +73,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
 		);
 
 	_gain_db_label = create_label (this, _("dB"), false);
-	_gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
+	_gain_calculate_button = new Button (this, _("Calculate..."));
 
 	_delay_label = create_label (this, _("Delay"), true);
 	_delay = new ContentSpinCtrl<AudioContent> (
@@ -85,10 +88,10 @@ 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 wxStaticText (this, wxID_ANY, wxT (" \n"), wxDefaultPosition, wxDefaultSize);
+	_description = new StaticText (this, wxT(" \n"), wxDefaultPosition, wxDefaultSize);
 	_sizer->Add (_description, 0, wxALL, 12);
 	_description->SetFont (font);
 
@@ -115,14 +118,14 @@ AudioPanel::AudioPanel (ContentPanel* p)
 void
 AudioPanel::add_to_grid ()
 {
-	Config::Interface const interface = Config::instance()->interface_complexity();
+	bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
 
 	int r = 0;
 
-	_reference->Show (interface == Config::INTERFACE_FULL);
-	_reference_note->Show (interface == Config::INTERFACE_FULL);
+	_reference->Show (full);
+	_reference_note->Show (full);
 
-	if (interface == Config::INTERFACE_FULL) {
+	if (full) {
 		wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
 		reference_sizer->Add (_reference, 0);
 		reference_sizer->Add (_reference_note, 0);
@@ -141,18 +144,26 @@ AudioPanel::add_to_grid ()
 		s->Add (_gain_db_label, 0, wxALIGN_CENTER_VERTICAL);
 		_grid->Add (s, wxGBPosition(r, 1));
 	}
-	_grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 
-	++r;
+	_gain_calculate_button->Show (full);
 
-	add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
-	{
+	if (full) {
+		_grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+		++r;
+	}
+
+	_delay_label->Show (full);
+	_delay->show (full);
+	_delay_ms_label->Show (full);
+
+	if (full) {
+		add_label_to_sizer (_grid, _delay_label, true, wxGBPosition(r, 0));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		s->Add (_delay->wrapped(), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
 		s->Add (_delay_ms_label, 0, wxALIGN_CENTER_VERTICAL);
 		_grid->Add (s, wxGBPosition(r, 1));
+		++r;
 	}
-	++r;
 }
 
 AudioPanel::~AudioPanel ()
@@ -166,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:
@@ -236,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.