X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=fbcd9047fbf034b717968f12b40a44f7343df939;hb=1a721b82d4094c00ee89574e17c58c23c0de8cdd;hp=4e4b6d6a003810d59f353969d2048214917a6284;hpb=425f936336e669555a0806b321cb90ea569e18c3;p=dcpomatic.git

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 4e4b6d6a0..fbcd9047f 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -20,27 +20,29 @@
 
 
 #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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
+LIBDCP_ENABLE_WARNINGS
 #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 +479,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 +495,7 @@ AudioPlot::mouse_moved (wxMouseEvent& ev)
 void
 AudioPlot::mouse_leave (wxMouseEvent &)
 {
-	_cursor = {};
+	_cursor = boost::none;
 	Refresh ();
 	Cursor (optional<DCPTime>(), optional<float>());
 }