Don't display all possible channel checkboxes while the analysis

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 81687ca809942ecb00a67a209b71180ba94fda38..0f6bace2590282c8ad792513e22afd1fcdf03ab0 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -38,16 +38,18 @@ using std::list;
 using std::vector;
 using std::pair;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** @param parent Parent window.
  *  @param film Film we are using.
  *  @param content Content to analyse, or 0 to analyse all of the film's audio.
  */
-AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content)
+AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer, shared_ptr<Content> content)
        : wxDialog (
                parent,
                wxID_ANY,
@@ -64,6 +66,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 #endif
                )
        , _film (film)
+       , _viewer (viewer)
        , _content (content)
        , _channels (film->audio_channels ())
        , _plot (0)
@@ -78,7 +81,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 
        _cursor = new StaticText (this, wxT("Cursor: none"));
        left->Add (_cursor, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
-       _plot = new AudioPlot (this);
+       _plot = new AudioPlot (this, viewer);
        left->Add (_plot, 1, wxTOP | wxEXPAND, 12);
        _sample_peak = new StaticText (this, wxT (""));
        left->Add (_sample_peak, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
@@ -88,6 +91,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        left->Add (_integrated_loudness, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
        _loudness_range = new StaticText (this, wxT (""));
        left->Add (_loudness_range, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
+       _leqm = new StaticText (this, wxT(""));
+       left->Add (_leqm, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 
        lr_sizer->Add (left, 1, wxALL | wxEXPAND, 12);
 
@@ -99,16 +104,14 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
                right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
        }
 
-       for (int i = 0; i < _channels; ++i) {
+       for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
                _channel_checkbox[i] = new CheckBox (this, std_to_wx(audio_channel_name(i)));
                _channel_checkbox[i]->SetForegroundColour(wxColour(_plot->colour(i)));
                right->Add (_channel_checkbox[i], 0, wxEXPAND | wxALL, 3);
                _channel_checkbox[i]->Bind (wxEVT_CHECKBOX, boost::bind (&AudioDialog::channel_clicked, this, _1));
        }
 
-       for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
-               _channel_checkbox[i] = 0;
-       }
+       show_or_hide_channel_checkboxes ();
 
        {
                wxStaticText* m = new StaticText (this, _("Type"));
@@ -152,7 +155,8 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
 
-       _film_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
+       _film_connection = film->Change.connect (boost::bind(&AudioDialog::film_change, this, _1, _2));
+       _film_content_connection = film->ContentChange.connect (boost::bind (&AudioDialog::content_change, this, _1, _3));
        DCPOMATIC_ASSERT (film->directory());
        SetTitle(wxString::Format(_("DCP-o-matic audio - %s"), std_to_wx(film->directory().get().string())));
 
@@ -166,6 +170,20 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        _plot->Cursor.connect (bind (&AudioDialog::set_cursor, this, _1, _2));
 }
 
+
+void
+AudioDialog::show_or_hide_channel_checkboxes ()
+{
+       for (int i = 0; i < _channels; ++i) {
+               _channel_checkbox[i]->Show ();
+       }
+
+       for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+               _channel_checkbox[i]->Hide ();
+       }
+}
+
+
 void
 AudioDialog::try_to_load_analysis ()
 {
@@ -182,6 +200,13 @@ AudioDialog::try_to_load_analysis ()
        if (!boost::filesystem::exists (path)) {
                _plot->set_analysis (shared_ptr<AudioAnalysis> ());
                _analysis.reset ();
+
+               BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+                       if (dynamic_pointer_cast<AnalyseAudioJob>(i)) {
+                               i->cancel ();
+                       }
+               }
+
                JobManager::instance()->analyse_audio (
                        film, _playlist, !static_cast<bool>(check), _analysis_finished_connection, bind (&AudioDialog::analysis_finished, this)
                        );
@@ -207,6 +232,7 @@ AudioDialog::try_to_load_analysis ()
        _plot->set_analysis (_analysis);
        _plot->set_gain_correction (_analysis->gain_correction (_playlist));
        setup_statistics ();
+       show_or_hide_channel_checkboxes ();
 
        /* Set up some defaults if no check boxes are checked */
 
@@ -283,6 +309,22 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
        _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
 
+void
+AudioDialog::film_change (ChangeType type, int p)
+{
+       if (type != CHANGE_TYPE_DONE) {
+               return;
+       }
+
+       if (p == Film::AUDIO_CHANNELS) {
+               shared_ptr<Film> film = _film.lock ();
+               if (film) {
+                       _channels = film->audio_channels ();
+                       try_to_load_analysis ();
+               }
+       }
+}
+
 void
 AudioDialog::content_change (ChangeType type, int p)
 {
@@ -337,7 +379,7 @@ AudioDialog::setup_statistics ()
        }
 
        pair<AudioAnalysis::PeakTime, int> const peak = _analysis->overall_sample_peak ();
-       float const peak_dB = 20 * log10 (peak.first.peak) + _analysis->gain_correction (_playlist);
+       float const peak_dB = linear_to_db(peak.first.peak) + _analysis->gain_correction(_playlist);
        _sample_peak->SetLabel (
                wxString::Format (
                        _("Sample peak is %.2fdB at %s on %s"),
@@ -355,7 +397,7 @@ AudioDialog::setup_statistics ()
 
        if (_analysis->overall_true_peak()) {
                float const peak = _analysis->overall_true_peak().get();
-               float const peak_dB = 20 * log10 (peak) + _analysis->gain_correction (_playlist);
+               float const peak_dB = linear_to_db(peak) + _analysis->gain_correction(_playlist);
 
                _true_peak->SetLabel (wxString::Format (_("True peak is %.2fdB"), peak_dB));
 
@@ -385,6 +427,14 @@ AudioDialog::setup_statistics ()
                                )
                        );
        }
+
+       if (static_cast<bool>(_analysis->leqm())) {
+               _leqm->SetLabel(
+                       wxString::Format(
+                               _("LEQ(m) %.2fdB"), _analysis->leqm().get() + _analysis->gain_correction(_playlist)
+                               )
+                       );
+       }
 }
 
 bool