Apply fader-based gain calculations to the current gain, not 0dB.
[dcpomatic.git] / src / wx / audio_panel.cc
index 954d1676d4abfc03c2d52e80bbc6636d50e5d947..5523d25393088196d88655581121b43f740c6522 100644 (file)
@@ -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(_gain->wrapped()->GetValue() + *c);
 
        /* This appears to be necessary, as the change is not signalled,
           I think.
@@ -266,7 +277,7 @@ AudioPanel::setup_description ()
                return;
        }
 
-       checked_set (_description, ac.front()->audio->processing_description ());
+       checked_set (_description, ac.front()->audio->processing_description(_parent->film()));
 }
 
 void
@@ -304,8 +315,14 @@ AudioPanel::setup_sensitivity ()
        }
 
        string why_not;
-       bool const can_reference = dcp && dcp->can_reference_audio (why_not);
-       setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
+       bool const can_reference = dcp && dcp->can_reference_audio (_parent->film(), 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);
@@ -353,7 +370,7 @@ AudioPanel::setup_peak ()
                _peak->SetLabel (wxT (""));
        } else {
                shared_ptr<Playlist> playlist (new Playlist);
-               playlist->add (sel.front ());
+               playlist->add (_parent->film(), sel.front());
                try {
                        shared_ptr<AudioAnalysis> analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist)));
                        peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist);