diff options
Diffstat (limited to 'src')
44 files changed, 41 insertions, 43 deletions
diff --git a/src/analyzer/analyzerwaveform.cpp b/src/analyzer/analyzerwaveform.cpp index 11c4da93b0..1abbf1e303 100644 --- a/src/analyzer/analyzerwaveform.cpp +++ b/src/analyzer/analyzerwaveform.cpp @@ -1,8 +1,8 @@ #include "analyzer/analyzerwaveform.h" #include "engine/engineobject.h" -#include "engine/enginefilterbutterworth8.h" -#include "engine/enginefilterbessel4.h" +#include "engine/filters/enginefilterbutterworth8.h" +#include "engine/filters/enginefilterbessel4.h" #include "library/trackcollection.h" #include "track/track.h" #include "waveform/waveformfactory.h" diff --git a/src/effects/builtin/autopaneffect.h b/src/effects/builtin/autopaneffect.h index c10f265d21..dc4141a8be 100644 --- a/src/effects/builtin/autopaneffect.h +++ b/src/effects/builtin/autopaneffect.h @@ -6,7 +6,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterpansingle.h" +#include "engine/filters/enginefilterpansingle.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/balanceeffect.h b/src/effects/builtin/balanceeffect.h index 7276e51423..8e01dc3129 100644 --- a/src/effects/builtin/balanceeffect.h +++ b/src/effects/builtin/balanceeffect.h @@ -4,7 +4,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterlinkwitzriley4.h" +#include "engine/filters/enginefilterlinkwitzriley4.h" #include "util/samplebuffer.h" #include "util/memory.h" diff --git a/src/effects/builtin/bessel4lvmixeqeffect.h b/src/effects/builtin/bessel4lvmixeqeffect.h index 87ac83bd9b..877cbd51fb 100644 --- a/src/effects/builtin/bessel4lvmixeqeffect.h +++ b/src/effects/builtin/bessel4lvmixeqeffect.h @@ -9,8 +9,8 @@ #include "effects/builtin/lvmixeqbase.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterbessel4.h" -#include "engine/enginefilterdelay.h" +#include "engine/filters/enginefilterbessel4.h" +#include "engine/filters/enginefilterdelay.h" #include "util/class.h" #include "util/types.h" #include "util/defs.h" diff --git a/src/effects/builtin/bessel8lvmixeqeffect.h b/src/effects/builtin/bessel8lvmixeqeffect.h index a65a21dad8..a44dfa5a87 100644 --- a/src/effects/builtin/bessel8lvmixeqeffect.h +++ b/src/effects/builtin/bessel8lvmixeqeffect.h @@ -10,8 +10,8 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterbessel8.h" -#include "engine/enginefilterdelay.h" +#include "engine/filters/enginefilterbessel8.h" +#include "engine/filters/enginefilterdelay.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/biquadfullkilleqeffect.h b/src/effects/builtin/biquadfullkilleqeffect.h index 67bfffcfe7..b8bdde98a1 100644 --- a/src/effects/builtin/biquadfullkilleqeffect.h +++ b/src/effects/builtin/biquadfullkilleqeffect.h @@ -6,10 +6,10 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterbiquad1.h" -#include "engine/enginefilterbessel4.h" +#include "engine/filters/enginefilterbiquad1.h" +#include "engine/filters/enginefilterbessel4.h" #include "effects/builtin/lvmixeqbase.h" -#include "engine/enginefilterdelay.h" +#include "engine/filters/enginefilterdelay.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/filtereffect.h b/src/effects/builtin/filtereffect.h index 2d96226c8d..b37eaa5cb7 100644 --- a/src/effects/builtin/filtereffect.h +++ b/src/effects/builtin/filtereffect.h @@ -5,7 +5,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterbiquad1.h" +#include "engine/filters/enginefilterbiquad1.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/graphiceqeffect.h b/src/effects/builtin/graphiceqeffect.h index 673f6efe88..29905cc040 100644 --- a/src/effects/builtin/graphiceqeffect.h +++ b/src/effects/builtin/graphiceqeffect.h @@ -8,7 +8,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterbiquad1.h" +#include "engine/filters/enginefilterbiquad1.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/linkwitzriley8eqeffect.h b/src/effects/builtin/linkwitzriley8eqeffect.h index 5cbd729660..a545edc1ad 100644 --- a/src/effects/builtin/linkwitzriley8eqeffect.h +++ b/src/effects/builtin/linkwitzriley8eqeffect.h @@ -8,7 +8,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterlinkwitzriley8.h" +#include "engine/filters/enginefilterlinkwitzriley8.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/loudnesscontoureffect.h b/src/effects/builtin/loudnesscontoureffect.h index ccff153543..b133a5b983 100644 --- a/src/effects/builtin/loudnesscontoureffect.h +++ b/src/effects/builtin/loudnesscontoureffect.h @@ -6,7 +6,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterbiquad1.h" +#include "engine/filters/enginefilterbiquad1.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/lvmixeqbase.h b/src/effects/builtin/lvmixeqbase.h index 5db984dc8d..1674500011 100644 --- a/src/effects/builtin/lvmixeqbase.h +++ b/src/effects/builtin/lvmixeqbase.h @@ -2,7 +2,7 @@ #define BESSELLVMIXEQBASE_H #include "effects/effectprocessor.h" -#include "engine/enginefilterdelay.h" +#include "engine/filters/enginefilterdelay.h" #include "util/defs.h" #include "util/math.h" #include "util/sample.h" diff --git a/src/effects/builtin/metronomeeffect.h b/src/effects/builtin/metronomeeffect.h index 8624cc4791..805bbf365d 100644 --- a/src/effects/builtin/metronomeeffect.h +++ b/src/effects/builtin/metronomeeffect.h @@ -6,7 +6,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterpansingle.h" +#include "engine/filters/enginefilterpansingle.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/moogladder4filtereffect.h b/src/effects/builtin/moogladder4filtereffect.h index d540aa3868..e6acf8d498 100644 --- a/src/effects/builtin/moogladder4filtereffect.h +++ b/src/effects/builtin/moogladder4filtereffect.h @@ -5,7 +5,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefiltermoogladder4.h" +#include "engine/filters/enginefiltermoogladder4.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/parametriceqeffect.h b/src/effects/builtin/parametriceqeffect.h index 4ca4cdc105..dcbf103b24 100644 --- a/src/effects/builtin/parametriceqeffect.h +++ b/src/effects/builtin/parametriceqeffect.h @@ -9,7 +9,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterbiquad1.h" +#include "engine/filters/enginefilterbiquad1.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/effects/builtin/threebandbiquadeqeffect.h b/src/effects/builtin/threebandbiquadeqeffect.h index d08d87286c..73a00891ef 100644 --- a/src/effects/builtin/threebandbiquadeqeffect.h +++ b/src/effects/builtin/threebandbiquadeqeffect.h @@ -6,7 +6,7 @@ #include "effects/effectprocessor.h" #include "engine/effects/engineeffect.h" #include "engine/effects/engineeffectparameter.h" -#include "engine/enginefilterbiquad1.h" +#include "engine/filters/enginefilterbiquad1.h" #include "util/class.h" #include "util/defs.h" #include "util/sample.h" diff --git a/src/engine/enginedeck.cpp b/src/engine/enginedeck.cpp index 0304e055b7..b93c60ccb2 100644 --- a/src/engine/enginedeck.cpp +++ b/src/engine/enginedeck.cpp @@ -21,7 +21,6 @@ #include "effects/effectsmanager.h" #include "engine/effects/engineeffectsmanager.h" #include "engine/enginebuffer.h" -#include "engine/enginefilterbessel4.h" #include "engine/enginepregain.h" #include "engine/enginevumeter.h" #include "util/sample.h" diff --git a/src/engine/enginefilter.cpp b/src/engine/filters/enginefilter.cpp index f4b34fbff4..28ba93bc96 100644 --- a/src/engine/enginefilter.cpp +++ b/src/engine/filters/enginefilter.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include "engine/enginefilter.h" +#include "engine/filters/enginefilter.h" #include <QtDebug> diff --git a/src/engine/enginefilter.h b/src/engine/filters/enginefilter.h index 2fabcfeed5..2fabcfeed5 100644 --- a/src/engine/enginefilter.h +++ b/src/engine/filters/enginefilter.h diff --git a/src/engine/enginefilterbessel4.cpp b/src/engine/filters/enginefilterbessel4.cpp index 9e2c6f5798..65054c078c 100644 --- a/src/engine/enginefilterbessel4.cpp +++ b/src/engine/filters/enginefilterbessel4.cpp @@ -1,4 +1,4 @@ -#include "engine/enginefilterbessel4.h" +#include "engine/filters/enginefilterbessel4.h" #include "util/math.h" diff --git a/src/engine/enginefilterbessel4.h b/src/engine/filters/enginefilterbessel4.h index 4f8fd76edc..02fa3dd25e 100644 --- a/src/engine/enginefilterbessel4.h +++ b/src/engine/filters/enginefilterbessel4.h @@ -1,7 +1,7 @@ #ifndef ENGINEFILTERBESSEL4_H #define ENGINEFILTERBESSEL4_H -#include "engine/enginefilteriir.h" +#include "engine/filters/enginefilteriir.h" class EngineFilterBessel4Low : public EngineFilterIIR<4, IIR_LP> { Q_OBJECT diff --git a/src/engine/enginefilterbessel8.cpp b/src/engine/filters/enginefilterbessel8.cpp index 4410ea2faa..b4f1248c76 100644 --- a/src/engine/enginefilterbessel8.cpp +++ b/src/engine/filters/enginefilterbessel8.cpp @@ -1,4 +1,4 @@ -#include "engine/enginefilterbessel8.h" +#include "engine/filters/enginefilterbessel8.h" #include "util/math.h" diff --git a/src/engine/enginefilterbessel8.h b/src/engine/filters/enginefilterbessel8.h index f6f0c8b438..40bcb5d314 100644 --- a/src/engine/enginefilterbessel8.h +++ b/src/engine/filters/enginefilterbessel8.h @@ -1,7 +1,7 @@ #ifndef ENGINEFILTERBESSEL8_H #define ENGINEFILTERBESSEL8_H -#include "engine/enginefilteriir.h" +#include "engine/filters/enginefilteriir.h" class EngineFilterBessel8Low : public EngineFilterIIR<8, IIR_LP> { Q_OBJECT diff --git a/src/engine/enginefilterbiquad1.cpp b/src/engine/filters/enginefilterbiquad1.cpp index 683f264099..1bf853462b 100644 --- a/src/engine/enginefilterbiquad1.cpp +++ b/src/engine/filters/enginefilterbiquad1.cpp @@ -1,5 +1,5 @@ #include <stdio.h> -#include "engine/enginefilterbiquad1.h" +#include "engine/filters/enginefilterbiquad1.h" EngineFilterBiquad1LowShelving::EngineFilterBiquad1LowShelving(int sampleRate, double centerFreq, diff --git a/src/engine/enginefilterbiquad1.h b/src/engine/filters/enginefilterbiquad1.h index 57bf802d71..7ad767c1be 100644 --- a/src/engine/enginefilterbiquad1.h +++ b/src/engine/filters/enginefilterbiquad1.h @@ -1,7 +1,7 @@ #ifndef ENGINEFILTERBIQUAD1_H #define ENGINEFILTERBIQUAD1_H -#include "engine/enginefilteriir.h" +#include "engine/filters/enginefilteriir.h" #ifdef _MSC_VER // Visual Studio doesn't have snprintf diff --git a/src/engine/enginefilterbutterworth4.cpp b/src/engine/filters/enginefilterbutterworth4.cpp index 2359a38035..9fa4bb1d53 100644 --- a/src/engine/enginefilterbutterworth4.cpp +++ b/src/engine/filters/enginefilterbutterworth4.cpp @@ -1,4 +1,4 @@ -#include "engine/enginefilterbutterworth4.h" +#include "engine/filters/enginefilterbutterworth4.h" EngineFilterButterworth4Low::EngineFilterButterworth4Low(int sampleRate, double freqCorner1) { diff --git a/src/engine/enginefilterbutterworth4.h b/src/engine/filters/enginefilterbutterworth4.h index f6e4d05776..7133c60ca4 100644 --- a/src/engine/enginefilterbutterworth4.h +++ b/src/engine/filters/enginefilterbutterworth4.h @@ -1,7 +1,7 @@ #ifndef ENGINEFILTERBUTTERWORTH4_H #define ENGINEFILTERBUTTERWORTH4_H -#include "engine/enginefilteriir.h" +#include "engine/filters/enginefilteriir.h" class EngineFilterButterworth4Low : public EngineFilterIIR<4, IIR_LP> { Q_OBJECT diff --git a/src/engine/enginefilterbutterworth8.cpp b/src/engine/filters/enginefilterbutterworth8.cpp index 7cc42b59bb..67c1b20acc 100644 --- a/src/engine/enginefilterbutterworth8.cpp +++ b/src/engine/filters/enginefilterbutterworth8.cpp @@ -1,4 +1,4 @@ -#include "engine/enginefilterbutterworth8.h" +#include "engine/filters/enginefilterbutterworth8.h" EngineFilterButterworth8Low::EngineFilterButterworth8Low(int sampleRate, double freqCorner1) { setFrequencyCorners(sampleRate, freqCorner1); diff --git a/src/engine/enginefilterbutterworth8.h b/src/engine/filters/enginefilterbutterworth8.h index 0ac20b26c3..49f412c45f 100644 --- a/src/engine/enginefilterbutterworth8.h +++ b/src/engine/filters/enginefilterbutterworth8.h @@ -1,7 +1,7 @@ #ifndef ENGINEFILTERBUTTERWORTH8_H #define ENGINEFILTERBUTTERWORTH8_H -#include "engine/enginefilteriir.h" +#include "engine/filters/enginefilteriir.h" class EngineFilterButterworth8Low : public EngineFilterIIR<8, IIR_LP> { Q_OBJECT diff --git a/src/engine/enginefilterdelay.h b/src/engine/filters/enginefilterdelay.h index 8071338c56..8071338c56 100644 --- a/src/engine/enginefilterdelay.h +++ b/src/engine/filters/enginefilterdelay.h diff --git a/src/engine/enginefilteriir.h b/src/engine/filters/enginefilteriir.h index 6a3144286b..6a3144286b 100644 --- a/src/engine/enginefilteriir.h +++ b/src/engine/filters/enginefilteriir.h diff --git a/src/engine/enginefilterlinkwitzriley2.cpp b/src/engine/filters/enginefilterlinkwitzriley2.cpp index a5ae8e9032..2febe164f2 100644 --- a/src/engine/enginefilterlinkwitzriley2.cpp +++ b/src/engine/filters/enginefilterlinkwitzriley2.cpp @@ -1,4 +1,4 @@ -#include "engine/enginefilterlinkwitzriley2.h" +#include "engine/filters/enginefilterlinkwitzriley2.h" EngineFilterLinkwitzRiley2Low::EngineFilterLinkwitzRiley2Low(int sampleRate, double freqCorner1) { diff --git a/src/engine/enginefilterlinkwitzriley2.h b/src/engine/filters/enginefilterlinkwitzriley2.h index 2340ed06ec..229b4c5ef8 100644 --- a/src/engine/enginefilterlinkwitzriley2.h +++ b/src/engine/filters/enginefilterlinkwitzriley2.h @@ -1,7 +1,7 @@ #ifndef ENGINEFILTELINKWITZRILEY2_H #define ENGINEFILTELINKWITZRILEY2_H -#include "engine/enginefilteriir.h" +#include "engine/filters/enginefilteriir.h" class EngineFilterLinkwitzRiley2Low : public EngineFilterIIR<2, IIR_LP2> { Q_OBJECT diff --git a/src/engine/enginefilterlinkwitzriley4.cpp b/src/engine/filters/enginefilterlinkwitzriley4.cpp index 387fcd5ef8..de1e8fe7ea 100644 --- a/src/engine/enginefilterlinkwitzriley4.cpp +++ b/src/engine/filters/enginefilterlinkwitzriley4.cpp @@ -1,4 +1,4 @@ -#include "engine/enginefilterlinkwitzriley4.h" +#include "engine/filters/enginefilterlinkwitzriley4.h" EngineFilterLinkwitzRiley4Low::EngineFilterLinkwitzRiley4Low(int sampleRate, double freqCorner1) { diff --git a/src/engine/enginefilterlinkwitzriley4.h b/src/engine/filters/enginefilterlinkwitzriley4.h index 21dbe7144c..ed179f47df 100644 --- a/src/engine/enginefilterlinkwitzriley4.h +++ b/src/engine/filters/enginefilterlinkwitzriley4.h @@ -1,7 +1,7 @@ #ifndef ENGINEFILTELINKWITZRILEY4_H #define ENGINEFILTELINKWITZRILEY4_H -#include "engine/enginefilteriir.h" +#include "engine/filters/enginefilteriir.h" class EngineFilterLinkwitzRiley4Low : public EngineFilterIIR<4, IIR_LP> { Q_OBJECT diff --git a/src/engine/enginefilterlinkwitzriley8.cpp b/src/engine/filters/enginefilterlinkwitzriley8.cpp index bab0167afd..e66abf22a0 100644 --- a/src/engine/enginefilterlinkwitzriley8.cpp +++ b/src/engine/filters/enginefilterlinkwitzriley8.cpp @@ -1,4 +1,4 @@ -#include "engine/enginefilterlinkwitzriley8.h" +#include "engine/filters/enginefilterlinkwitzriley8.h" EngineFilterLinkwitzRiley8Low::EngineFilterLinkwitzRiley8Low(int sampleRate, double freqCorner1) { diff --git a/src/engine/enginefilterlinkwitzriley8.h b/src/engine/filters/enginefilterlinkwitzriley8.h index 7b6e4b5f17..63906af37a 100644 --- a/src/engine/enginefilterlinkwitzriley8.h +++ b/src/engine/filters/enginefilterlinkwitzriley8.h @@ -1,7 +1,7 @@ #ifndef ENGINEFILTELINKWITZRILEY8_H #define ENGINEFILTELINKWITZRILEY8_H -#include "engine/enginefilteriir.h" +#include "engine/filters/enginefilteriir.h" class EngineFilterLinkwitzRiley8Low : public EngineFilterIIR<8, IIR_LP> { Q_OBJECT diff --git a/src/engine/enginefiltermoogladder4.cpp b/src/engine/filters/enginefiltermoogladder4.cpp index d8760affc7..9f3d153d5e 100644 --- a/src/engine/enginefiltermoogladder4.cpp +++ b/src/engine/filters/enginefiltermoogladder4.cpp @@ -1,4 +1,4 @@ -#include "engine/enginefiltermoogladder4.h" +#include "engine/filters/enginefiltermoogladder4.h" EngineFilterMoogLadder4Low::EngineFilterMoogLadder4Low(int sampleRate, diff --git a/src/engine/enginefiltermoogladder4.h b/src/engine/filters/enginefiltermoogladder4.h index 2bd17990c3..2bd17990c3 100644 --- a/src/engine/enginefiltermoogladder4.h +++ b/src/engine/filters/enginefiltermoogladder4.h diff --git a/src/engine/enginefilterpan.h b/src/engine/filters/enginefilterpan.h index e1e07c71f6..e1e07c71f6 100644 --- a/src/engine/enginefilterpan.h +++ b/src/engine/filters/enginefilterpan.h diff --git a/src/engine/enginefilterpansingle.h b/src/engine/filters/enginefilterpansingle.h index 0e72d7a834..0e72d7a834 100644 --- a/src/engine/enginefilterpansingle.h +++ b/src/engine/filters/enginefilterpansingle.h diff --git a/src/preferences/dialog/dlgprefcrossfader.cpp b/src/preferences/dialog/dlgprefcrossfader.cpp index 8dfbe3fc3f..853a186f5f 100644 --- a/src/preferences/dialog/dlgprefcrossfader.cpp +++ b/src/preferences/dialog/dlgprefcrossfader.cpp @@ -2,9 +2,9 @@ #include <QtDebug> #include "preferences/dialog/dlgprefcrossfader.h" -#include "engine/enginefilterbessel4.h" #include "control/controlobject.h" #include "engine/enginexfader.h" +#include "util/math.h" #include "util/rescaler.h" DlgPrefCrossfader::DlgPrefCrossfader( diff --git a/src/preferences/dialog/dlgprefeq.cpp b/src/preferences/dialog/dlgprefeq.cpp index 90edfaac20..90ad1c0107 100644 --- a/src/preferences/dialog/dlgprefeq.cpp +++ b/src/preferences/dialog/dlgprefeq.cpp @@ -23,7 +23,7 @@ #include "effects/builtin/biquadfullkilleqeffect.h" #include "effects/builtin/filtereffect.h" #include "effects/effectslot.h" -#include "engine/enginefilterbessel4.h" +#include "engine/filters/enginefilterbessel4.h" #include "control/controlobject.h" #include "control/controlproxy.h" #include "util/math.h" diff --git a/src/preferences/dialog/dlgpreflv2.cpp b/src/preferences/dialog/dlgpreflv2.cpp index 451eec8594..637d2011ae 100644 --- a/src/preferences/dialog/dlgpreflv2.cpp +++ b/src/preferences/dialog/dlgpreflv2.cpp @@ -6,7 +6,6 @@ #include <QPushButton> #include "dlgpreflv2.h" -#include "engine/enginefilterbessel4.h" #include "control/controlobject.h" #include "util/math.h" #include "effects/effectsmanager.h" diff --git a/src/test/enginefilterbiquadtest.cpp b/src/test/enginefilterbiquadtest.cpp index c8680c1ae2..d43419177e 100644 --- a/src/test/enginefilterbiquadtest.cpp +++ b/src/test/enginefilterbiquadtest.cpp @@ -1,6 +1,6 @@ #include <gtest/gtest.h> -#include "engine/enginefilterbiquad1.h" +#include "engine/filters/enginefilterbiquad1.h" namespace { |