Fix audio analysis after recent breakage.
authorCarl Hetherington <cth@carlh.net>
Fri, 19 Jun 2015 22:19:34 +0000 (23:19 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 19 Jun 2015 22:19:34 +0000 (23:19 +0100)
ChangeLog
src/wx/audio_dialog.cc
src/wx/audio_dialog.h

index 4a19d73..0f1e792 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-19  Carl Hetherington  <cth@carlh.net>
+
+       * Fix non-working audio analysis dialogue.
+
 2015-06-18  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.1.5 released.
index 26c12aa..c2afb53 100644 (file)
@@ -108,7 +108,6 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film)
        overall_sizer->SetSizeHints (this);
 
        _film_connection = film->ContentChanged.connect (boost::bind (&AudioDialog::try_to_load_analysis, this));
-       try_to_load_analysis ();
        SetTitle (_("DCP-o-matic audio"));
 }
 
@@ -258,3 +257,12 @@ AudioDialog::setup_peak_time ()
                _peak_time->SetForegroundColour (wxColour (0, 0, 0));
        }
 }
+
+void
+AudioDialog::Show ()
+{
+       wxDialog::Show ();
+       try_to_load_analysis ();
+}
+
+       
index 3c2d4f6..f044963 100644 (file)
@@ -31,6 +31,8 @@ class AudioDialog : public wxDialog
 public:
        AudioDialog (wxWindow *, boost::shared_ptr<Film> film);
 
+       void Show ();
+
 private:
        void content_changed (int);
        void channel_clicked (wxCommandEvent &);