Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

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

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 7b2955e27e244990a057cbe19f969efad80ab6f0..094f8e1b0124527e4b27794d53c4f1a3c14e832b 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -20,8 +20,8 @@
 #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"
 
 class AudioPlot : public wxPanel
 {
@@ -33,11 +33,12 @@ public:
        void set_type_visible (int t, bool v);
        void set_gain (float);
        void set_smoothing (int);
+       void set_message (wxString);
 
        static const int max_smoothing;
 
 private:
-       void paint (wxPaintEvent &);
+       void paint ();
 
        boost::shared_ptr<AudioAnalysis> _analysis;
        bool _channel_visible[MAX_AUDIO_CHANNELS];
@@ -57,5 +58,7 @@ private:
        float _x_scale;
        float _y_scale;
 
+       wxString _message;
+
        static const int _minimum;
 };