comparison dsp/onsets/DetectionFunction.h @ 505:930b5b0f707d

Merge branch 'codestyle-and-tidy'

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
 
-#ifndef DETECTIONFUNCTION_H
-#define DETECTIONFUNCTION_H
+#ifndef QM_DSP_DETECTIONFUNCTION_H
+#define QM_DSP_DETECTIONFUNCTION_H
 
 #include "maths/MathUtilities.h"
 #include "maths/MathAliases.h"
 #include "dsp/phasevocoder/PhaseVocoder.h"
 #include "base/Window.h"

 #define DF_PHASEDEV (3)
 #define DF_COMPLEXSD (4)
 #define DF_BROADBAND (5)
 
 struct DFConfig{
-    unsigned int stepSize; // DF step in samples
-    unsigned int frameLength; // DF analysis window - usually 2*step. Must be even!
+    int stepSize; // DF step in samples
+    int frameLength; // DF analysis window - usually 2*step. Must be even!
     int DFType; // type of detection function ( see defines )
     double dbRise; // only used for broadband df (and required for it)
     bool adaptiveWhitening; // perform adaptive whitening
     double whiteningRelaxCoeff; // if < 0, a sensible default will be used
     double whiteningFloor; // if < 0, a sensible default will be used

 
 class DetectionFunction  
 {
 public:
     double* getSpectrumMagnitude();
-    DetectionFunction( DFConfig Config );
+    DetectionFunction( DFConfig config );
     virtual ~DetectionFunction();
 
     /**
      * Process a single time-domain frame of audio, provided as
      * frameLength samples.

 
 private:
     void whiten();
     double runDF();
 
-    double HFC( unsigned int length, double* src);
-    double specDiff( unsigned int length, double* src);
-    double phaseDev(unsigned int length, double *srcPhase);
-    double complexSD(unsigned int length, double *srcMagnitude, double *srcPhase);
-    double broadband(unsigned int length, double *srcMagnitude);
-	
+    double HFC(int length, double* src);
+    double specDiff(int length, double* src);
+    double phaseDev(int length, double *srcPhase);
+    double complexSD(int length, double *srcMagnitude, double *srcPhase);
+    double broadband(int length, double *srcMagnitude);
+        
 private:
     void initialise( DFConfig Config );
     void deInitialise();
 
     int m_DFType;
-    unsigned int m_dataLength;
-    unsigned int m_halfLength;
-    unsigned int m_stepSize;
+    int m_dataLength;
+    int m_halfLength;
+    int m_stepSize;
     double m_dbRise;
     bool m_whiten;
     double m_whitenRelaxCoeff;
     double m_whitenFloor;
 

     double* m_magnitude; // Magnitude of analysis frame ( frequency domain )
     double* m_thetaAngle;// Phase of analysis frame ( frequency domain )
     double* m_unwrapped; // Unwrapped phase of analysis frame
 
     Window<double> *m_window;
-    PhaseVocoder* m_phaseVoc;	// Phase Vocoder
+    PhaseVocoder* m_phaseVoc;   // Phase Vocoder
 };
 
 #endif