Apply fader-based gain calculations to the current gain, not 0dB.

[dcpomatic.git] / src / wx / audio_panel.cc

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index d86ff5df69a668c5393ca3b5c3fa15e5f3cd3b9e..5523d25393088196d88655581121b43f740c6522 100644 (file)
--- 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);
@@ -118,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);
@@ -144,15 +144,19 @@ 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);
 
-       _delay_label->Show (interface == Config::INTERFACE_FULL);
-       _delay->show (interface == Config::INTERFACE_FULL);
-       _delay_ms_label->Show (interface == Config::INTERFACE_FULL);
+       if (full) {
+               _grid->Add (_gain_calculate_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+               ++r;
+       }
 
-       if (interface == Config::INTERFACE_FULL) {
+       _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);
@@ -173,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:
@@ -243,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(_gain->wrapped()->GetValue() + *c);
 
        /* This appears to be necessary, as the change is not signalled,
           I think.
@@ -312,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);