diff --git a/inc/BandPassFilter.h b/inc/BandPassFilter.h deleted file mode 100644 index e2c0fd0..0000000 --- a/inc/BandPassFilter.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "Filter.h" - -class BandPassFilter : public Filter { - protected: - float GetSampleForFilterType() override; - - public: - BandPassFilter(); - BandPassFilter(Filter* filter); - BandPassFilter(float freq, float res, float q); - ~BandPassFilter(); - bool IsSameFilterType(FilterType type) override { return type == BandPass; }; -}; - - diff --git a/inc/Filter.h b/inc/Filter.h index 2307f1c..f87dac3 100644 --- a/inc/Filter.h +++ b/inc/Filter.h @@ -34,3 +34,39 @@ class Filter : public IEffect { float GetPeakGain() { return m_drive; } virtual bool IsSameFilterType(FilterType type) { return false; }; }; + +class BandPassFilter : public Filter { + protected: + float GetSampleForFilterType() override; + + public: + BandPassFilter(); + BandPassFilter(Filter* filter); + BandPassFilter(float freq, float res, float q); + ~BandPassFilter(); + bool IsSameFilterType(FilterType type) override { return type == BandPass; }; +}; + +class HighPassFilter : public Filter { + protected: + float GetSampleForFilterType() override; + + public: + HighPassFilter(); + HighPassFilter(Filter* filter); + HighPassFilter(float freq, float res, float q); + ~HighPassFilter(); + bool IsSameFilterType(FilterType type) override { return type == HighPass; }; +}; + +class LowPassFilter : public Filter { + protected: + float GetSampleForFilterType() override; + + public: + LowPassFilter(); + LowPassFilter(Filter* filter); + LowPassFilter(float freq, float res, float q); + ~LowPassFilter(); + bool IsSameFilterType(FilterType type) override { return type == LowPass; }; +}; \ No newline at end of file diff --git a/inc/FilterFactory.h b/inc/FilterFactory.h index 1fe471c..0c8a3f6 100644 --- a/inc/FilterFactory.h +++ b/inc/FilterFactory.h @@ -1,8 +1,5 @@ #pragma once #include "Filter.h" -#include "LowPassFilter.h" -#include "BandPassFilter.h" -#include "HighPassFilter.h" struct FilterFactory { static Filter* CreateFilter(Filter* old_filter, FilterType new_type) { diff --git a/inc/HighPassFilter.h b/inc/HighPassFilter.h deleted file mode 100644 index fa430ce..0000000 --- a/inc/HighPassFilter.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once -#include "Filter.h" - -class HighPassFilter : public Filter { - protected: - float GetSampleForFilterType() override; - - public: - HighPassFilter(); - HighPassFilter(Filter* filter); - HighPassFilter(float freq, float res, float q); - ~HighPassFilter(); - bool IsSameFilterType(FilterType type) override { return type == HighPass; }; -}; diff --git a/inc/LowPassFilter.h b/inc/LowPassFilter.h deleted file mode 100644 index f447670..0000000 --- a/inc/LowPassFilter.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "Filter.h" - -class LowPassFilter : public Filter { - protected: - float GetSampleForFilterType() override; - - public: - LowPassFilter(); - LowPassFilter(Filter* filter); - LowPassFilter(float freq, float res, float q); - ~LowPassFilter(); - bool IsSameFilterType(FilterType type) override { return type == LowPass; }; -}; - diff --git a/src/BandPassFilter.cpp b/src/BandPassFilter.cpp index 2f1ee52..8bc9eeb 100644 --- a/src/BandPassFilter.cpp +++ b/src/BandPassFilter.cpp @@ -1,4 +1,4 @@ -#include "BandPassFilter.h" +#include "Filter.h" #include "Settings.h" BandPassFilter::BandPassFilter() { diff --git a/src/HighPassFilter.cpp b/src/HighPassFilter.cpp index 90879d0..cb87ba7 100644 --- a/src/HighPassFilter.cpp +++ b/src/HighPassFilter.cpp @@ -1,4 +1,4 @@ -#include "HighPassFilter.h" +#include "Filter.h" #include "Settings.h" HighPassFilter::HighPassFilter() { diff --git a/src/LowPassFilter.cpp b/src/LowPassFilter.cpp index 73cd8dc..eae67de 100644 --- a/src/LowPassFilter.cpp +++ b/src/LowPassFilter.cpp @@ -1,4 +1,4 @@ -#include "LowPassFilter.h" +#include "Filter.h" #include "Settings.h" LowPassFilter::LowPassFilter() { diff --git a/src/Synth.cpp b/src/Synth.cpp index 4165b8a..14a57de 100644 --- a/src/Synth.cpp +++ b/src/Synth.cpp @@ -4,7 +4,6 @@ #include "Logger.h" #include "OscillatorType.h" #include "Settings.h" -#include "LowPassFilter.h" Synth::Synth(/* args */) { m_lfo = new LFO();