Cleanup: move some methods from util to maths_util.

5 files changed, 22 insertions, 14 deletions

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 9e0d7a30f..c64f64e31 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "audio_dialog.h"
 #include "audio_plot.h"
 #include "check_box.h"
@@ -28,10 +29,12 @@
 #include "lib/audio_content.h"
 #include "lib/film.h"
 #include "lib/job_manager.h"
+#include "lib/maths_util.h"
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
 
+
 using std::cout;
 using std::list;
 using std::make_shared;
@@ -48,6 +51,7 @@ using namespace dcpomatic;
 using namespace boost::placeholders;
 #endif
 
+
 /** @param parent Parent window.
  *  @param film Film we are using.
  *  @param content Content to analyse, or 0 to analyse all of the film's audio.
diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc
index fb9bd2544..2c0f17c0a 100644
--- a/src/wx/audio_gain_dialog.cc
+++ b/src/wx/audio_gain_dialog.cc
@@ -18,11 +18,13 @@
 
 */
 
+
 #include "audio_gain_dialog.h"
 #include "wx_util.h"
-#include "lib/util.h"
-#include <cmath>
+#include "lib/maths_util.h"
 #include <wx/spinctrl.h>
+#include <cmath>
+
 
 AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v)
 	: TableDialog (parent, _("Channel gain"), 3, 1, true)
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 7c12a1646..81fa1a70d 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -24,11 +24,11 @@
  */
 
 
+#include "audio_gain_dialog.h"
 #include "audio_mapping_view.h"
 #include "wx_util.h"
-#include "audio_gain_dialog.h"
 #include "lib/audio_mapping.h"
-#include "lib/util.h"
+#include "lib/maths_util.h"
 #include "lib/warnings.h"
 #include <dcp/locale_convert.h>
 #include <dcp/types.h>
@@ -43,13 +43,13 @@ DCPOMATIC_ENABLE_WARNINGS
 
 using std::cout;
 using std::list;
-using std::string;
-using std::min;
+using std::make_pair;
 using std::max;
-using std::vector;
+using std::min;
 using std::pair;
-using std::make_pair;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 75659aebd..af030e915 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -35,6 +35,7 @@
 #include "lib/job_manager.h"
 #include "lib/dcp_content.h"
 #include "lib/audio_content.h"
+#include "lib/maths_util.h"
 #include <wx/spinctrl.h>
 #include <iostream>
 
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 90a4aa91d..e08e07e05 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -20,27 +20,28 @@
 
 
 #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>
+#include <iostream>
 
 
 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