No-op; rename a whole load of wx constants to their shorter equivalents.

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

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index ab26329a4b878a564ecf9cd96e9eed8890f674db..cef82f9ffcf1ae9fadacc4e7233bd630048afdbf 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -111,9 +111,9 @@ 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));
 
@@ -141,7 +141,9 @@ AudioPanel::film_changed (Film::Property property)
                setup_description ();
                break;
        case Film::REEL_TYPE:
+       case Film::INTEROP:
                setup_sensitivity ();
+               break;
        default:
                break;
        }
@@ -272,17 +274,19 @@ AudioPanel::setup_sensitivity ()
        if (_reference->GetValue ()) {
                _gain->wrapped()->Enable (false);
                _gain_calculate_button->Enable (false);
+               _show->Enable (true);
                _peak->Enable (false);
                _delay->wrapped()->Enable (false);
                _mapping->Enable (false);
                _description->Enable (false);
        } else {
-               _gain->wrapped()->Enable (true);
+               _gain->wrapped()->Enable (sel.size() == 1);
                _gain_calculate_button->Enable (sel.size() == 1);
-               _peak->Enable (true);
-               _delay->wrapped()->Enable (true);
+               _show->Enable (sel.size() == 1);
+               _peak->Enable (sel.size() == 1);
+               _delay->wrapped()->Enable (sel.size() == 1);
                _mapping->Enable (sel.size() == 1);
-               _description->Enable (true);
+               _description->Enable (sel.size() == 1);
        }
 }
 
@@ -316,15 +320,11 @@ 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"));
+                       float const peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist);
+                       if (peak_dB > -3) {
+                               alert = true;
                        }
+                       _peak->SetLabel (wxString::Format (_("Peak: %.2fdB"), peak_dB));
                } catch (...) {
                        _peak->SetLabel (_("Peak: unknown"));
                }