Tidying.

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

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 4e4b6d6a003810d59f353969d2048214917a6284..a4518d5dd484141b36f5924f00347f57b3554c04 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -20,27 +20,26 @@
 
 
 #include "audio_plot.h"
-#include "wx_util.h"
 #include "film_viewer.h"
+#include "wx_util.h"
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
 #include "lib/compose.hpp"
+#include "lib/maths_util.h"
 #include <wx/graphics.h>
 #include <boost/bind/bind.hpp>
-#include <iostream>
 #include <cfloat>
 
 
-using std::cout;
-using std::vector;
 using std::list;
+using std::map;
 using std::max;
 using std::min;
-using std::map;
-using boost::bind;
-using boost::optional;
 using std::shared_ptr;
+using std::vector;
 using std::weak_ptr;
+using boost::bind;
+using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -477,7 +476,7 @@ AudioPlot::mouse_moved (wxMouseEvent& ev)
                search (_peak, ev, min_dist, min_point);
        }
 
-       _cursor = {};
+       _cursor = boost::none;
 
        if (min_dist < DBL_MAX) {
                wxRect before (min_point.draw.x - _cursor_size / 2, min_point.draw.y - _cursor_size / 2, _cursor_size, _cursor_size);
@@ -493,7 +492,7 @@ AudioPlot::mouse_moved (wxMouseEvent& ev)
 void
 AudioPlot::mouse_leave (wxMouseEvent &)
 {
-       _cursor = {};
+       _cursor = boost::none;
        Refresh ();
        Cursor (optional<DCPTime>(), optional<float>());
 }