Merge master.

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

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 514faeea0e952ff83c716392d3aacf5a5514d2ee..b277852928d19f53e3849464a0541d24c65288c3 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -31,21 +31,21 @@ class AudioDialog : public wxDialog
 public:
        AudioDialog (wxWindow *);
 
-       void set_film (boost::shared_ptr<Film>);
+       void set_content (boost::shared_ptr<AudioContent>);
 
 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 setup_channels ();
+       void analysis_finished ();
 
-       boost::shared_ptr<Film> _film;
+       boost::shared_ptr<AudioContent> _content;
        AudioPlot* _plot;
-       wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
+       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 _content_changed_connection;
+       boost::signals2::scoped_connection _analysis_finished_connection;
 };