comparison src/OnsetDetectionFunction.h @ 117:ca2d83d29814 tip master

Merge branch 'release/1.0.5'

     /** Constructor that defaults the onset detection function type to ComplexSpectralDifferenceHWR
      * and the window type to HanningWindow
      * @param hopSize_ the hop size in audio samples
      * @param frameSize_ the frame size in audio samples
      */
-	OnsetDetectionFunction (int hopSize_, int frameSize_);
+	OnsetDetectionFunction (int hopSize, int frameSize);
     
     
     /** Constructor 
      * @param hopSize_ the hop size in audio samples
      * @param frameSize_ the frame size in audio samples
      * @param onsetDetectionFunctionType_ the type of onset detection function to use - (see OnsetDetectionFunctionType)
      * @param windowType the type of window to use (see WindowType)
      */
-	OnsetDetectionFunction (int hopSize_, int frameSize_, int onsetDetectionFunctionType_, int windowType_);
+	OnsetDetectionFunction (int hopSize, int frameSize, int onsetDetectionFunctionType, int windowType);
     
     /** Destructor */
 	~OnsetDetectionFunction();
     
     /** Initialisation function for only updating hop size and frame size (and not window type 
      * or onset detection function type
      * @param hopSize_ the hop size in audio samples
      * @param frameSize_ the frame size in audio samples
      */
-	void initialise (int hopSize_, int frameSize_);
+	void initialise (int hopSize, int frameSize);
     
     /** Initialisation Function 
      * @param hopSize_ the hop size in audio samples
      * @param frameSize_ the frame size in audio samples
      * @param onsetDetectionFunctionType_ the type of onset detection function to use - (see OnsetDetectionFunctionType)
      * @param windowType the type of window to use (see WindowType)
      */
-	void initialise (int hopSize_, int frameSize_, int onsetDetectionFunctionType_, int windowType_);
+	void initialise (int hopSize, int frameSize, int onsetDetectionFunctionType, int windowType);
 	
     /** Process input frame and calculate detection function sample 
      * @param buffer a pointer to an array containing the audio samples to be processed
      * @returns the onset detection function sample
      */
 	double calculateOnsetDetectionFunctionSample (double* buffer);
     
     /** Set the detection function type 
      * @param onsetDetectionFunctionType_ the type of onset detection function to use - (see OnsetDetectionFunctionType)
      */
-	void setOnsetDetectionFunctionType (int onsetDetectionFunctionType_);
+	void setOnsetDetectionFunctionType (int onsetDetectionFunctionType);
 	
 private:
 	
     /** Perform the FFT on the data in 'frame' */
 	void performFFT();

     std::vector<double> prevMagSpec;    /**< previous magnitude spectrum */
 	
     std::vector<double> phase;          /**< FFT phase values */
     std::vector<double> prevPhase;      /**< previous phase values */
     std::vector<double> prevPhase2;     /**< second order previous phase values */
-
 };
 
 
 #endif