Revision: 37707
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37707
Author: nexyon
Date: 2011-06-21 20:12:39 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
3D Audio GSoC:
Code cleanup: rewriting some functions to static methods.
Modified Paths:
--------------
branches/soc-2011-pepper/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
branches/soc-2011-pepper/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.h
branches/soc-2011-pepper/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/soc-2011-pepper/intern/audaspace/FX/AUD_RectifyFactory.h
branches/soc-2011-pepper/intern/audaspace/FX/AUD_SquareFactory.cpp
branches/soc-2011-pepper/intern/audaspace/FX/AUD_SquareFactory.h
Modified:
branches/soc-2011-pepper/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
2011-06-21 19:31:06 UTC (rev 37706)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
2011-06-21 20:12:39 UTC (rev 37707)
@@ -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 @@
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);
Modified: branches/soc-2011-pepper/intern/audaspace/FX/AUD_AccumulatorFactory.h
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_AccumulatorFactory.h
2011-06-21 19:31:06 UTC (rev 37706)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_AccumulatorFactory.h
2011-06-21 20:12:39 UTC (rev 37707)
@@ -33,6 +33,7 @@
#define AUD_ACCUMULATORFACTORY
#include "AUD_EffectFactory.h"
+class AUD_CallbackIIRFilterReader;
/**
* This factory creates an accumulator reader.
@@ -58,6 +59,9 @@
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
Modified: branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
2011-06-21 19:31:06 UTC (rev 37706)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
2011-06-21 20:12:39 UTC (rev 37707)
@@ -42,7 +42,7 @@
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 @@
return (in > out ? param->attack : param->release) * (out - in) + in;
}
-void endEnvelopeFilter(EnvelopeParameters* param)
+void AUD_EnvelopeFactory::endEnvelopeFilter(EnvelopeParameters* param)
{
delete param;
}
Modified: branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.h
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.h
2011-06-21 19:31:06 UTC (rev 37706)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_EnvelopeFactory.h
2011-06-21 20:12:39 UTC (rev 37707)
@@ -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 @@
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
Modified: branches/soc-2011-pepper/intern/audaspace/FX/AUD_RectifyFactory.cpp
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_RectifyFactory.cpp
2011-06-21 19:31:06 UTC (rev 37706)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_RectifyFactory.cpp
2011-06-21 20:12:39 UTC (rev 37707)
@@ -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));
}
Modified: branches/soc-2011-pepper/intern/audaspace/FX/AUD_RectifyFactory.h
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_RectifyFactory.h
2011-06-21 19:31:06 UTC (rev 37706)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_RectifyFactory.h
2011-06-21 20:12:39 UTC (rev 37707)
@@ -33,6 +33,7 @@
#define AUD_RECTIFYFACTORY
#include "AUD_EffectFactory.h"
+class AUD_CallbackIIRFilterReader;
/**
* This factory rectifies another factory.
@@ -52,6 +53,8 @@
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
Modified: branches/soc-2011-pepper/intern/audaspace/FX/AUD_SquareFactory.cpp
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_SquareFactory.cpp
2011-06-21 19:31:06 UTC (rev 37706)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_SquareFactory.cpp
2011-06-21 20:12:39 UTC (rev 37707)
@@ -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 @@
return 0;
}
-void endSquareFilter(float* threshold)
+void AUD_SquareFactory::endSquareFilter(float* threshold)
{
delete threshold;
}
Modified: branches/soc-2011-pepper/intern/audaspace/FX/AUD_SquareFactory.h
===================================================================
--- branches/soc-2011-pepper/intern/audaspace/FX/AUD_SquareFactory.h
2011-06-21 19:31:06 UTC (rev 37706)
+++ branches/soc-2011-pepper/intern/audaspace/FX/AUD_SquareFactory.h
2011-06-21 20:12:39 UTC (rev 37707)
@@ -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 @@
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
