diff src/Matcher.h @ 113:46a652da1415 refactors

Sample rate and fft size no longer needed in Matcher parameters
author Chris Cannam
date Thu, 04 Dec 2014 15:59:31 +0000
parents 6636aca831c0
children 42381e437fcd
line wrap: on
line diff
--- a/src/Matcher.h	Thu Dec 04 15:55:05 2014 +0000
+++ b/src/Matcher.h	Thu Dec 04 15:59:31 2014 +0000
@@ -54,19 +54,14 @@
 
     struct Parameters {
 
-        Parameters(float rate_, double hopTime_, int fftSize_) :
-            sampleRate(rate_),
+        Parameters(double hopTime_) :
             distanceNorm(DistanceMetric::NormaliseDistanceToLogSum),
             hopTime(hopTime_),
-            fftSize(fftSize_),
             blockTime(10.0),
             maxRunCount(3),
             diagonalWeight(2.0)
         {}
 
-        /** Sample rate of audio */
-        float sampleRate;
-
         /** Type of distance metric normalisation */
         DistanceMetric::DistanceNormalisation distanceNorm;
 
@@ -76,13 +71,6 @@
          */
         double hopTime;
         
-        /** Size of an FFT frame in samples. Note that the data passed
-         *  in to Matcher is already in the frequency domain, so this
-         *  expresses the size of the frame that the caller will be
-         *  providing.
-         */
-        int fftSize;
-        
         /** The width of the search band (error margin) around the current
          *  match position, measured in seconds. Strictly speaking the
          *  width is measured backwards from the current point, since the