Merge master and multifarious hackery.

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

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 3cb9c1726afcd72833187ebc1c4d9982d2cc21da..db1d74f306393ceaf9860919aefe82434a92ea36 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -25,7 +25,6 @@
 
 class AudioPlot;
 class Film;
-class Playlist;
 
 class AudioDialog : public wxDialog
 {
@@ -40,10 +39,8 @@ private:
        void type_clicked (wxCommandEvent &);
        void smoothing_changed (wxScrollEvent &);
        void try_to_load_analysis ();
-       void setup_channels ();
 
        boost::shared_ptr<Film> _film;
-       boost::shared_ptr<Playlist> _playlist;
        AudioPlot* _plot;
        wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
        wxCheckBox* _type_checkbox[AudioPoint::COUNT];