diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-06-22 00:12:39 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-22 00:12:39 +0400 |
commit | f2ceca4eb05675f4058fc6666805de58cb10916f (patch) | |
tree | 09540730b9793edee2003ec7f864066387bce437 /intern/audaspace/FX | |
parent | 24ca3eb4c42f3dfb4e2b775f53b35e4c4dcd8367 (diff) |
3D Audio GSoC:
Code cleanup: rewriting some functions to static methods.
Diffstat (limited to 'intern/audaspace/FX')
-rw-r--r-- | intern/audaspace/FX/AUD_AccumulatorFactory.cpp | 4 | ||||
-rw-r--r-- | intern/audaspace/FX/AUD_AccumulatorFactory.h | 4 | ||||
-rw-r--r-- | intern/audaspace/FX/AUD_EnvelopeFactory.cpp | 4 | ||||
-rw-r--r-- | intern/audaspace/FX/AUD_EnvelopeFactory.h | 5 | ||||
-rw-r--r-- | intern/audaspace/FX/AUD_RectifyFactory.cpp | 2 | ||||
-rw-r--r-- | intern/audaspace/FX/AUD_RectifyFactory.h | 3 | ||||
-rw-r--r-- | intern/audaspace/FX/AUD_SquareFactory.cpp | 4 | ||||
-rw-r--r-- | intern/audaspace/FX/AUD_SquareFactory.h | 4 |
8 files changed, 23 insertions, 7 deletions
diff --git a/intern/audaspace/FX/AUD_AccumulatorFactory.cpp b/intern/audaspace/FX/AUD_AccumulatorFactory.cpp index b0996ebf849..0dffa7fc9ea 100644 --- a/intern/audaspace/FX/AUD_AccumulatorFactory.cpp +++ b/intern/audaspace/FX/AUD_AccumulatorFactory.cpp @@ -32,7 +32,7 @@ #include "AUD_AccumulatorFactory.h" #include "AUD_CallbackIIRFilterReader.h" -sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless) +sample_t AUD_AccumulatorFactory::accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless) { float in = reader->x(0); float lastin = reader->x(-1); @@ -42,7 +42,7 @@ sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* us return out; } -sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless) +sample_t AUD_AccumulatorFactory::accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless) { float in = reader->x(0); float lastin = reader->x(-1); diff --git a/intern/audaspace/FX/AUD_AccumulatorFactory.h b/intern/audaspace/FX/AUD_AccumulatorFactory.h index c147d1226e5..5838ccee7f0 100644 --- a/intern/audaspace/FX/AUD_AccumulatorFactory.h +++ b/intern/audaspace/FX/AUD_AccumulatorFactory.h @@ -33,6 +33,7 @@ #define AUD_ACCUMULATORFACTORY #include "AUD_EffectFactory.h" +class AUD_CallbackIIRFilterReader; /** * This factory creates an accumulator reader. @@ -58,6 +59,9 @@ public: AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory, bool additive = false); virtual AUD_Reference<AUD_IReader> createReader(); + + static sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless); + static sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless); }; #endif //AUD_ACCUMULATORFACTORY diff --git a/intern/audaspace/FX/AUD_EnvelopeFactory.cpp b/intern/audaspace/FX/AUD_EnvelopeFactory.cpp index 53378efb053..3057c7b7d62 100644 --- a/intern/audaspace/FX/AUD_EnvelopeFactory.cpp +++ b/intern/audaspace/FX/AUD_EnvelopeFactory.cpp @@ -42,7 +42,7 @@ struct EnvelopeParameters float arthreshold; }; -sample_t envelopeFilter(AUD_CallbackIIRFilterReader* reader, EnvelopeParameters* param) +sample_t AUD_EnvelopeFactory::envelopeFilter(AUD_CallbackIIRFilterReader* reader, EnvelopeParameters* param) { float in = fabs(reader->x(0)); float out = reader->y(-1); @@ -51,7 +51,7 @@ sample_t envelopeFilter(AUD_CallbackIIRFilterReader* reader, EnvelopeParameters* return (in > out ? param->attack : param->release) * (out - in) + in; } -void endEnvelopeFilter(EnvelopeParameters* param) +void AUD_EnvelopeFactory::endEnvelopeFilter(EnvelopeParameters* param) { delete param; } diff --git a/intern/audaspace/FX/AUD_EnvelopeFactory.h b/intern/audaspace/FX/AUD_EnvelopeFactory.h index acf3b13dbc8..a480a05d478 100644 --- a/intern/audaspace/FX/AUD_EnvelopeFactory.h +++ b/intern/audaspace/FX/AUD_EnvelopeFactory.h @@ -33,6 +33,8 @@ #define AUD_ENVELOPEFACTORY #include "AUD_EffectFactory.h" +class AUD_CallbackIIRFilterReader; +struct EnvelopeParameters; /** * This factory creates an envelope follower reader. @@ -77,6 +79,9 @@ public: float threshold, float arthreshold); virtual AUD_Reference<AUD_IReader> createReader(); + + static sample_t envelopeFilter(AUD_CallbackIIRFilterReader* reader, EnvelopeParameters* param); + static void endEnvelopeFilter(EnvelopeParameters* param); }; #endif //AUD_ENVELOPEFACTORY diff --git a/intern/audaspace/FX/AUD_RectifyFactory.cpp b/intern/audaspace/FX/AUD_RectifyFactory.cpp index 1e500dae3cc..cbb676a9a32 100644 --- a/intern/audaspace/FX/AUD_RectifyFactory.cpp +++ b/intern/audaspace/FX/AUD_RectifyFactory.cpp @@ -34,7 +34,7 @@ #include <cmath> -sample_t rectifyFilter(AUD_CallbackIIRFilterReader* reader, void* useless) +sample_t AUD_RectifyFactory::rectifyFilter(AUD_CallbackIIRFilterReader* reader, void* useless) { return fabs(reader->x(0)); } diff --git a/intern/audaspace/FX/AUD_RectifyFactory.h b/intern/audaspace/FX/AUD_RectifyFactory.h index d7dc236c5fc..16b44469c05 100644 --- a/intern/audaspace/FX/AUD_RectifyFactory.h +++ b/intern/audaspace/FX/AUD_RectifyFactory.h @@ -33,6 +33,7 @@ #define AUD_RECTIFYFACTORY #include "AUD_EffectFactory.h" +class AUD_CallbackIIRFilterReader; /** * This factory rectifies another factory. @@ -52,6 +53,8 @@ public: AUD_RectifyFactory(AUD_Reference<AUD_IFactory> factory); virtual AUD_Reference<AUD_IReader> createReader(); + + static sample_t rectifyFilter(AUD_CallbackIIRFilterReader* reader, void* useless); }; #endif //AUD_RECTIFYFACTORY diff --git a/intern/audaspace/FX/AUD_SquareFactory.cpp b/intern/audaspace/FX/AUD_SquareFactory.cpp index 3e94107ff8a..226085a1814 100644 --- a/intern/audaspace/FX/AUD_SquareFactory.cpp +++ b/intern/audaspace/FX/AUD_SquareFactory.cpp @@ -32,7 +32,7 @@ #include "AUD_SquareFactory.h" #include "AUD_CallbackIIRFilterReader.h" -sample_t squareFilter(AUD_CallbackIIRFilterReader* reader, float* threshold) +sample_t AUD_SquareFactory::squareFilter(AUD_CallbackIIRFilterReader* reader, float* threshold) { float in = reader->x(0); if(in >= *threshold) @@ -43,7 +43,7 @@ sample_t squareFilter(AUD_CallbackIIRFilterReader* reader, float* threshold) return 0; } -void endSquareFilter(float* threshold) +void AUD_SquareFactory::endSquareFilter(float* threshold) { delete threshold; } diff --git a/intern/audaspace/FX/AUD_SquareFactory.h b/intern/audaspace/FX/AUD_SquareFactory.h index 31f22614e0a..21284361cca 100644 --- a/intern/audaspace/FX/AUD_SquareFactory.h +++ b/intern/audaspace/FX/AUD_SquareFactory.h @@ -33,6 +33,7 @@ #define AUD_SQUAREFACTORY #include "AUD_EffectFactory.h" +class AUD_CallbackIIRFilterReader; /** * This factory Transforms any signal to a square signal. @@ -63,6 +64,9 @@ public: float getThreshold() const; virtual AUD_Reference<AUD_IReader> createReader(); + + static sample_t squareFilter(AUD_CallbackIIRFilterReader* reader, float* threshold); + static void endSquareFilter(float* threshold); }; #endif //AUD_SQUAREFACTORY |