Merge master.

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

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 5605f94a53486439e9d98a39322b7057e06a7281..adf11e633030262a62dfa4802f3c3cc5e7bcaf6d 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -23,6 +23,8 @@
 #include "lib/util.h"
 #include "lib/audio_analysis.h"
 
+struct Metrics;
+
 class AudioPlot : public wxPanel
 {
 public:
@@ -38,26 +40,19 @@ public:
        static const int max_smoothing;
 
 private:
-       void paint (wxPaintEvent &);
+       void paint ();
+       void plot_peak (wxGraphicsPath &, int, Metrics const &) const;
+       void plot_rms (wxGraphicsPath &, int, Metrics const &) const;
+       float y_for_linear (float, Metrics const &) const;
 
        boost::shared_ptr<AudioAnalysis> _analysis;
-       bool _channel_visible[MAX_AUDIO_CHANNELS];
+       bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
        bool _type_visible[AudioPoint::COUNT];
        /** gain to apply in dB */
        float _gain;
        int _smoothing;
        std::vector<wxColour> _colours;
 
-       void plot_peak (wxGraphicsPath &, int) const;
-       void plot_rms (wxGraphicsPath &, int) const;
-       float y_for_linear (float) const;
-
-       double _db_label_width;
-       int _height;
-       int _y_origin;
-       float _x_scale;
-       float _y_scale;
-
        wxString _message;
 
        static const int _minimum;