comparison src/OnsetDetectionFunction.h @ 92:f6708e4c69f1

More code style updates

     /** 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);
+	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();

 	int hopSize;						/**< audio hopsize */
 	int onsetDetectionFunctionType;		/**< type of detection function */
     int windowType;                     /**< type of window used in calculations */
 	
 	fftw_plan p;						/**< fftw plan */
-	fftw_complex *complexIn;			/**< to hold complex fft values for input */
-	fftw_complex *complexOut;			/**< to hold complex fft values for output */
+	fftw_complex* complexIn;			/**< to hold complex fft values for input */
+	fftw_complex* complexOut;			/**< to hold complex fft values for output */
 	
 	bool initialised;					/**< flag indicating whether buffers and FFT plans are initialised */
 
     std::vector<double> frame;          /**< audio frame */
     std::vector<double> window;         /**< window */