C++11 tidying.

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

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 27d76b6db3ce1fb235a5df7b1253e41b5d7583e3..b2ffd5ad52467aaf5f7ad6d63551bcdd2f95be20 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -20,10 +20,10 @@
 
 #include "lib/util.h"
 #include "lib/audio_analysis.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <vector>
 
@@ -76,7 +76,6 @@ private:
        void left_down ();
        void mouse_moved (wxMouseEvent& ev);
        void mouse_leave (wxMouseEvent& ev);
-       void search (std::map<int, PointList> const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const;
 
        std::weak_ptr<FilmViewer> _viewer;
        std::shared_ptr<AudioAnalysis> _analysis;
@@ -87,7 +86,9 @@ private:
        wxString _message;
        float _gain_correction;
 
+       /** peak values keyed by channel */
        mutable std::map<int, PointList> _peak;
+       /** RMS values keyed by channel */
        mutable std::map<int, PointList> _rms;
 
        boost::optional<Point> _cursor;