comparison src/BTrack.cpp @ 108:a6701b3f636f

Tidying up the interface to some functions

 
 //=======================================================================
 BTrack::BTrack()
  :  odf (512, 1024, ComplexSpectralDifferenceHWR, HanningWindow)
 {
-    initialise (512, 1024);
-}
-
-//=======================================================================
-BTrack::BTrack (int hopSize_)
- :  odf (hopSize_, 2 * hopSize_, ComplexSpectralDifferenceHWR, HanningWindow)
+    initialise (512);
+}
+
+//=======================================================================
+BTrack::BTrack (int hop)
+ :  odf (hop, 2 * hop, ComplexSpectralDifferenceHWR, HanningWindow)
 {	
-    initialise (hopSize_, 2 * hopSize_);
-}
-
-//=======================================================================
-BTrack::BTrack (int hopSize_, int frameSize_)
- : odf (hopSize_, frameSize_, ComplexSpectralDifferenceHWR, HanningWindow)
-{
-    initialise (hopSize_, frameSize_);
+    initialise (hop);
+}
+
+//=======================================================================
+BTrack::BTrack (int hop, int frame)
+ : odf (hop, frame, ComplexSpectralDifferenceHWR, HanningWindow)
+{
+    initialise (hop);
 }
 
 //=======================================================================
 BTrack::~BTrack()
 {

     delete [] fftOut;
 #endif
 }
 
 //=======================================================================
-double BTrack::getBeatTimeInSeconds (long frameNumber, int hopSize, int fs)
-{
-    double hop = (double) hopSize;
-    double samplingFrequency = (double) fs;
-    double frameNum = (double) frameNumber;
-    
-    return ((hop / samplingFrequency) * frameNum);
-}
-
-//=======================================================================
-void BTrack::initialise (int hopSize_, int frameSize_)
+double BTrack::getBeatTimeInSeconds (long frameNumber, int hopSize, int samplingFrequency)
+{
+    return ((static_cast<double> (hopSize) / static_cast<double> (samplingFrequency)) * static_cast<double> (frameNumber));
+}
+
+//=======================================================================
+void BTrack::initialise (int hop)
 {
     // set vector sizes
     resampledOnsetDF.resize (512);
     acf.resize (512);
     weightingVector.resize (128);

     prevDelta.resize (41);
     prevDeltaFixed.resize (41);
     
     double rayleighParameter = 43;
 	
-	
 	// initialise parameters
 	tightness = 5;
 	alpha = 0.9;
 	estimatedTempo = 120.0;
 	

 	
 	// tempo is not fixed
 	tempoFixed = false;
     
     // initialise algorithm given the hopsize
-    setHopSize (hopSize_);
+    setHopSize (hop);
     
     // Set up FFT for calculating the auto-correlation function
     FFTLengthForACFCalculation = 1024;
     
 #ifdef USE_FFTW

     cfgBackwards = kiss_fft_alloc (FFTLengthForACFCalculation, 1, 0, 0);
 #endif
 }
 
 //=======================================================================
-void BTrack::setHopSize (int hopSize_)
+void BTrack::setHopSize (int hop)
 {	
-	hopSize = hopSize_;
+	hopSize = hop;
 	onsetDFBufferSize = (512 * 512) / hopSize;		// calculate df buffer size
 	beatPeriod = round(60/((((double) hopSize)/44100) * 120.));
 
     // set size of onset detection function buffer
     onsetDF.resize (onsetDFBufferSize);

 		}
 	}
 }
 
 //=======================================================================
-void BTrack::updateHopAndFrameSize (int hopSize_, int frameSize_)
+void BTrack::updateHopAndFrameSize (int hop, int frame)
 {
     // update the onset detection function object
-    odf.initialise (hopSize_, frameSize_);
+    odf.initialise (hop, frame);
     
     // update the hop size being used by the beat tracker
-    setHopSize (hopSize_);
+    setHopSize (hop);
 }
 
 //=======================================================================
 bool BTrack::beatDueInCurrentFrame()
 {