comparison dsp/onsets/DetectionFunction.h @ 2:c539af5259da

* Make it possible to provide the detection function with frequency domain
  inputs (i.e. phase vocoder already run)

 public:
     double* getSpectrumMagnitude();
     DetectionFunction( DFConfig Config );
     virtual ~DetectionFunction();
     double process( double* TDomain );
+    double process( double* magnitudes, double* phases );
 
 private:
+    double runDF();
+
     double HFC( unsigned int length, double* src);
     double specDiff( unsigned int length, double* src);
     double phaseDev(unsigned int length, double *srcMagnitude, double *srcPhase);
     double complexSD(unsigned int length, double *srcMagnitude, double *srcPhase);
 	

 
     int m_DFType;
     unsigned int m_dataLength;
     unsigned int m_halfLength;
 
-    double* magHistory;
-    double* phaseHistory;
-    double* phaseHistoryOld;
+    double* m_magHistory;
+    double* m_phaseHistory;
+    double* m_phaseHistoryOld;
 
     double* m_DFWindowedFrame; // Array for windowed analysis frame
     double* m_magnitude; // Magnitude of analysis frame ( frequency domain )
     double* m_thetaAngle;// Phase of analysis frame ( frequency domain )
 
-
-    vector < ComplexData > meas ;
-	
-    ComplexData j;
-
     Window<double> *m_window;
-
-    PhaseVocoder*	m_phaseVoc;	// Phase Vocoder
-
+    PhaseVocoder* m_phaseVoc;	// Phase Vocoder
 };
 
 #endif