Merge master.

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

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 623c9a067a5d633342d4e79e4f3f29251a3e6372..db1d74f306393ceaf9860919aefe82434a92ea36 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -21,6 +21,7 @@
 #include <boost/signals2.hpp>
 #include <wx/wx.h>
 #include "lib/film.h"
+#include "lib/audio_analysis.h"
 
 class AudioPlot;
 class Film;
@@ -34,13 +35,16 @@ public:
 
 private:
        void film_changed (Film::Property);
-       void channel_changed (wxCommandEvent &);
+       void channel_clicked (wxCommandEvent &);
+       void type_clicked (wxCommandEvent &);
+       void smoothing_changed (wxScrollEvent &);
        void try_to_load_analysis ();
-       void setup_channels ();
 
        boost::shared_ptr<Film> _film;
        AudioPlot* _plot;
-       wxChoice* _channel;
+       wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
+       wxCheckBox* _type_checkbox[AudioPoint::COUNT];
+       wxSlider* _smoothing;
        boost::signals2::scoped_connection _film_changed_connection;
-       boost::signals2::scoped_connection _film_audio_analysis_finished_connection;
+       boost::signals2::scoped_connection _film_audio_analysis_succeeded_connection;
 };