diff dsp/tempotracking/DownBeat.h @ 493:bb78ca3fe7de

Remove "using" from some headers
author Chris Cannam <cannam@all-day-breakfast.com>
date Fri, 31 May 2019 17:24:50 +0100
parents 701233f8ed41
children
line wrap: on
line diff
--- a/dsp/tempotracking/DownBeat.h	Fri May 31 16:55:25 2019 +0100
+++ b/dsp/tempotracking/DownBeat.h	Fri May 31 17:24:50 2019 +0100
@@ -21,8 +21,6 @@
 
 #include "dsp/rateconversion/Decimator.h"
 
-using std::vector;
-
 class FFTReal;
 
 /**
@@ -71,8 +69,8 @@
      */
     void findDownBeats(const float *audio, // downsampled
                        size_t audioLength, // after downsampling
-                       const vector<double> &beats,
-                       vector<int> &downbeats);
+                       const std::vector<double> &beats,
+                       std::vector<int> &downbeats);
 
     /**
      * Return the beat spectral difference function.  This is
@@ -83,7 +81,7 @@
      * difference between region prior to the beat's nominal position
      * and the region following it.
      */
-    void getBeatSD(vector<double> &beatsd) const;
+    void getBeatSD(std::vector<double> &beatsd) const;
     
     /**
      * For your downsampling convenience: call this function
@@ -107,10 +105,10 @@
     void resetAudioBuffer();
 
 private:
-    typedef vector<int> i_vec_t;
-    typedef vector<vector<int> > i_mat_t;
-    typedef vector<double> d_vec_t;
-    typedef vector<vector<double> > d_mat_t;
+    typedef std::vector<int> i_vec_t;
+    typedef std::vector<std::vector<int> > i_mat_t;
+    typedef std::vector<double> d_vec_t;
+    typedef std::vector<std::vector<double> > d_mat_t;
 
     void makeDecimators();
     double measureSpecDiff(d_vec_t oldspec, d_vec_t newspec);