Fix audio analysis after recent breakage.

diff --git a/ChangeLog b/ChangeLog
index 4a19d73c0c47e77d2babc36a4cb0cb08b66c941e..0f1e7920f54aa0e21c1df0c7d9ad27605cfb4ff8 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.

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 26c12aa4915846a98974aab235207ee82d91ceca..c2afb53dc77f454cee2df277663ba008fdbaa5b9 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -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 ();
+}
+
+       

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 3c2d4f69c65f4b9a22a56df58a7c608f8275ed6f..f044963383204a829dac3dcc4183b92a59f9fb37 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -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 &);