comparison src/OnsetDetectionFunction.h @ 20:baf35f208814 develop

Replaced switch statements in OnsetDetectionFunction with enums. Renamed lots of functions so that they have better names, in camel case. Added some unit tests for initialisation of BTrack.
author Adam <adamstark.uk@gmail.com>
date Thu, 23 Jan 2014 15:31:11 +0000
parents 73c64ca0ed23
children a8e3e95d14e4
comparison
equal deleted inserted replaced
19:88c8d3862eee 20:baf35f208814
21 21
22 #ifndef __RTONSETDF_H 22 #ifndef __RTONSETDF_H
23 #define __RTONSETDF_H 23 #define __RTONSETDF_H
24 24
25 #include "fftw3.h" 25 #include "fftw3.h"
26
27 //=======================================================================
28 enum OnsetDetectionFunctionType
29 {
30 EnergyEnvelope,
31 EnergyDifference,
32 SpectralDifference,
33 SpectralDifferenceHWR,
34 PhaseDeviation,
35 ComplexSpectralDifference,
36 ComplexSpectralDifferenceHWR,
37 HighFrequencyContent,
38 HighFrequencySpectralDifference,
39 HighFrequencySpectralDifferenceHWR
40 };
41
42 //=======================================================================
43 enum WindowType
44 {
45 RectangularWindow,
46 HanningWindow,
47 HammingWindow,
48 BlackmanWindow,
49 TukeyWindow
50 };
26 51
27 class OnsetDetectionFunction 52 class OnsetDetectionFunction
28 { 53 {
29 public: 54 public:
30 55