X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.h;h=2027b6528f0dc2c9b205ccd295842897867b96d0;hb=3f5b9a71f980525481251461f9c3d63806972470;hp=7b2955e27e244990a057cbe19f969efad80ab6f0;hpb=ab0ef1016c94d583d00ccb734373d7d07faf0e24;p=dcpomatic.git

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 7b2955e27..2027b6528 100644
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,8 +20,10 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <wx/wx.h>
-#include "util.h"
-#include "audio_analysis.h"
+#include "lib/util.h"
+#include "lib/audio_analysis.h"
+
+struct Metrics;
 
 class AudioPlot : public wxPanel
 {
@@ -31,31 +33,26 @@ public:
 	void set_analysis (boost::shared_ptr<AudioAnalysis>);
 	void set_channel_visible (int c, bool v);
 	void set_type_visible (int t, bool v);
-	void set_gain (float);
 	void set_smoothing (int);
+	void set_message (wxString);
+	void set_gain_correction (double gain);
 
 	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;
+	AudioPoint get_point (int channel, int point) 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;
+	float _gain_correction;
 
 	static const int _minimum;
 };