Factor out some common stuff and give a better tooltip on the 'refer' buttons when...

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

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 8aca290cbbdbb323d74f010fee0a6bbd8b9085a5..34d6ac885be65d410f10df59ad9348e12e1c0b93 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -56,17 +56,13 @@ AudioPanel::AudioPanel (ContentPanel* p)
        grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
        ++r;
 
-       {
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _show = new wxButton (this, wxID_ANY, _("Show graph of audio levels..."));
-               s->Add (_show);
-               _peak = new wxStaticText (this, wxID_ANY, wxT (""));
-               s->Add (_peak, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
-               grid->Add (s, 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 (""));
+       grid->Add (_peak, wxGBPosition (r, 2), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
+       ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Gain"), true, wxGBPosition (r, 0));
        _gain = new ContentSpinCtrlDouble<AudioContent> (
                this,
                new wxSpinCtrlDouble (this),
@@ -76,12 +72,12 @@ AudioPanel::AudioPanel (ContentPanel* p)
                );
 
        _gain->add (grid, wxGBPosition (r, 1));
-       add_label_to_grid_bag_sizer (grid, this, _("dB"), false, wxGBPosition (r, 2));
+       add_label_to_sizer (grid, this, _("dB"), false, wxGBPosition (r, 2));
        _gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
        grid->Add (_gain_calculate_button, wxGBPosition (r, 3));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
+       add_label_to_sizer (grid, this, _("Delay"), true, wxGBPosition (r, 0));
        _delay = new ContentSpinCtrl<AudioContent> (
                this,
                new wxSpinCtrl (this),
@@ -92,7 +88,7 @@ AudioPanel::AudioPanel (ContentPanel* p)
 
        _delay->add (grid, wxGBPosition (r, 1));
        /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-       add_label_to_grid_bag_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
+       add_label_to_sizer (grid, this, _("ms"), false, wxGBPosition (r, 2));
        ++r;
 
        _mapping = new AudioMappingView (this);
@@ -249,16 +245,7 @@ AudioPanel::setup_sensitivity ()
 
        list<string> why_not;
        bool const can_reference = dcp && dcp->can_reference_audio (why_not);
-       _reference->Enable (can_reference);
-
-       wxString s;
-       if (!can_reference) {
-               s = _("Cannot reference this DCP.  ");
-               BOOST_FOREACH (string i, why_not) {
-                       s += std_to_wx(i) + wxT("  ");
-               }
-       }
-       _reference->SetToolTip (s);
+       setup_refer_button (_reference, dcp, can_reference, why_not);
 
        if (_reference->GetValue ()) {
                _gain->wrapped()->Enable (false);
@@ -307,8 +294,8 @@ AudioPanel::setup_peak ()
                playlist->add (sel.front ());
                try {
                        shared_ptr<AudioAnalysis> analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist)));
-                       if (analysis->peak ()) {
-                               float const peak_dB = 20 * log10 (analysis->peak().get()) + analysis->gain_correction (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;
                                }