comparison dsp/onsets/DetectionFunction.h @ 241:a98dd8ec96f8

* Move dsp/maths to maths ; bring PCA and HMM across from Soundbite

 */
 
 #ifndef DETECTIONFUNCTION_H
 #define DETECTIONFUNCTION_H
 
-#include "dsp/maths/MathUtilities.h"
-#include "dsp/maths/MathAliases.h"
+#include "maths/MathUtilities.h"
+#include "maths/MathAliases.h"
 #include "dsp/phasevocoder/PhaseVocoder.h"
 #include "base/Window.h"
 
 #define DF_HFC (1)
 #define DF_SPECDIFF (2)
 #define DF_PHASEDEV (3)
 #define DF_COMPLEXSD (4)
 #define DF_BROADBAND (5)
-#define DF_POWER (6)
 
 struct DFConfig{
     double stepSecs; // DF step in seconds
     unsigned int stepSize; // DF step in samples
     unsigned int frameLength; // DF analysis window - usually 2*step

     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 power(unsigned int length, double *src);
 	
 private:
     void initialise( DFConfig Config );
     void deInitialise();