diff --git a/lib/hooks/dft.cpp b/lib/hooks/dft.cpp index 55b932642..62bbab3eb 100644 --- a/lib/hooks/dft.cpp +++ b/lib/hooks/dft.cpp @@ -41,12 +41,12 @@ namespace node { class DftHook : public Hook { protected: - enum paddingTypeEnum { + enum PaddingType { ZERO, SIG_REPEAT }; - enum windowTypeEnum { + enum WindowType { NONE, FLATTOP, HANN, @@ -60,8 +60,8 @@ protected: Dumper* phasorAmplitude; Dumper* phasorFreq; - windowTypeEnum windowType; - paddingTypeEnum paddingType; + WindowType windowType; + PaddingType paddingType; struct format_type *format; @@ -98,8 +98,8 @@ protected: public: DftHook(struct vpath *p, struct vnode *n, int fl, int prio, bool en = true) : Hook(p, n, fl, prio, en), - windowType(windowTypeEnum::NONE), - paddingType(paddingTypeEnum::ZERO), + windowType(WindowType::NONE), + paddingType(PaddingType::ZERO), dftCalcCnt(0), sampleRate(0), startFreqency(0), @@ -276,28 +276,28 @@ public: if (!windowTypeC) { info("No Window type given, assume no windowing"); - windowType = windowTypeEnum::NONE; + windowType = WindowType::NONE; } else if (strcmp(windowTypeC, "flattop") == 0) - windowType = windowTypeEnum::FLATTOP; + windowType = WindowType::FLATTOP; else if (strcmp(windowTypeC, "hamming") == 0) - windowType = windowTypeEnum::HAMMING; + windowType = WindowType::HAMMING; else if (strcmp(windowTypeC, "hann") == 0) - windowType = windowTypeEnum::HANN; + windowType = WindowType::HANN; else { info("Window type %s not recognized, assume no windowing",windowTypeC); - windowType = windowTypeEnum::NONE; + windowType = WindowType::NONE; } if (!paddingTypeC) { info("No Padding type given, assume no zeropadding"); - paddingType = paddingTypeEnum::ZERO; + paddingType = PaddingType::ZERO; } else if (strcmp(paddingTypeC, "signal_repeat") == 0) - paddingType = paddingTypeEnum::SIG_REPEAT; + paddingType = PaddingType::SIG_REPEAT; else { info("Padding type %s not recognized, assume zero padding",paddingTypeC); - paddingType = paddingTypeEnum::ZERO; + paddingType = PaddingType::ZERO; } if (endFreqency < 0 || endFreqency > sampleRate) @@ -327,13 +327,13 @@ public: if (runDft) { for (uint i = 0; i < signalCnt; i++) { - calcDft(paddingTypeEnum::ZERO, smpMemory[i], smpMemPos); + calcDft(PaddingType::ZERO, smpMemory[i], smpMemPos); double maxF = 0; double maxA = 0; int maxPos = 0; for (uint i = 0; i