Mercurial > hg > qm-dsp

diff dsp/onsets/DetectionFunction.h @ 16:2e3f5d2d62c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Move dsp/maths to maths ; bring PCA and HMM across from Soundbite
author cannam
date Wed, 09 Jan 2008 10:31:29 +0000
parents 68801ecbab6a
children 5bec06ecc88a
line wrap: on
line diff
--- a/dsp/onsets/DetectionFunction.h	Wed Nov 21 16:53:51 2007 +0000
+++ b/dsp/onsets/DetectionFunction.h	Wed Jan 09 10:31:29 2008 +0000
@@ -11,8 +11,8 @@
 #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"
 
@@ -21,7 +21,6 @@
 #define DF_PHASEDEV (3)
 #define DF_COMPLEXSD (4)
 #define DF_BROADBAND (5)
-#define DF_POWER (6)
 
 struct DFConfig{
     double stepSecs; // DF step in seconds
@@ -52,7 +51,6 @@
     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 );