Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index db1d74f306393ceaf9860919aefe82434a92ea36..c99261150dda24da1bfbc670d2b67e0f78e0c4e2 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -17,11 +17,12 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include <wx/wx.h>
 #include "lib/film.h"
 #include "lib/audio_analysis.h"
+#include "lib/playlist.h"
+#include <wx/wx.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
 
 class AudioPlot;
 class Film;
@@ -29,22 +30,27 @@ class Film;
 class AudioDialog : public wxDialog
 {
 public:
-       AudioDialog (wxWindow *);
+       AudioDialog (wxWindow *, boost::shared_ptr<Film> film, boost::shared_ptr<AudioContent> content = boost::shared_ptr<AudioContent> ());
 
-       void set_film (boost::shared_ptr<Film>);
+       bool Show (bool show = true);
 
 private:
-       void film_changed (Film::Property);
+       void content_changed (int);
        void channel_clicked (wxCommandEvent &);
        void type_clicked (wxCommandEvent &);
-       void smoothing_changed (wxScrollEvent &);
+       void smoothing_changed ();
        void try_to_load_analysis ();
+       void analysis_finished ();
+       void setup_peak_time ();
 
-       boost::shared_ptr<Film> _film;
+       boost::shared_ptr<AudioAnalysis> _analysis;
+       boost::weak_ptr<Film> _film;
+       boost::shared_ptr<const Playlist> _playlist;
        AudioPlot* _plot;
-       wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
+       wxStaticText* _peak_time;
+       wxCheckBox* _channel_checkbox[MAX_DCP_AUDIO_CHANNELS];
        wxCheckBox* _type_checkbox[AudioPoint::COUNT];
        wxSlider* _smoothing;
-       boost::signals2::scoped_connection _film_changed_connection;
-       boost::signals2::scoped_connection _film_audio_analysis_succeeded_connection;
+       boost::signals2::scoped_connection _film_connection;
+       boost::signals2::scoped_connection _analysis_finished_connection;
 };