diff options
Diffstat (limited to 'intern/audaspace')
93 files changed, 275 insertions, 273 deletions
diff --git a/intern/audaspace/FX/AUD_AccumulatorFactory.h b/intern/audaspace/FX/AUD_AccumulatorFactory.h index d49d8f71c05..ac73c5aa6ae 100644 --- a/intern/audaspace/FX/AUD_AccumulatorFactory.h +++ b/intern/audaspace/FX/AUD_AccumulatorFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_ACCUMULATORFACTORY -#define AUD_ACCUMULATORFACTORY +#ifndef __AUD_ACCUMULATORFACTORY_H__ +#define __AUD_ACCUMULATORFACTORY_H__ #include "AUD_EffectFactory.h" class AUD_CallbackIIRFilterReader; @@ -66,4 +66,4 @@ public: static sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless); }; -#endif //AUD_ACCUMULATORFACTORY +#endif //__AUD_ACCUMULATORFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_BaseIIRFilterReader.h b/intern/audaspace/FX/AUD_BaseIIRFilterReader.h index 5b37f83ddee..43970c96a42 100644 --- a/intern/audaspace/FX/AUD_BaseIIRFilterReader.h +++ b/intern/audaspace/FX/AUD_BaseIIRFilterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BASEIIRFILTERREADER -#define AUD_BASEIIRFILTERREADER +#ifndef __AUD_BASEIIRFILTERREADER_H__ +#define __AUD_BASEIIRFILTERREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -132,4 +132,4 @@ public: virtual void sampleRateChanged(AUD_SampleRate rate); }; -#endif //AUD_BASEIIRFILTERREADER +#endif //__AUD_BASEIIRFILTERREADER_H__ diff --git a/intern/audaspace/FX/AUD_ButterworthFactory.h b/intern/audaspace/FX/AUD_ButterworthFactory.h index aa302e7e82a..d3606270154 100644 --- a/intern/audaspace/FX/AUD_ButterworthFactory.h +++ b/intern/audaspace/FX/AUD_ButterworthFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BUTTERWORTHFACTORY -#define AUD_BUTTERWORTHFACTORY +#ifndef __AUD_BUTTERWORTHFACTORY_H__ +#define __AUD_BUTTERWORTHFACTORY_H__ #include "AUD_DynamicIIRFilterFactory.h" @@ -60,4 +60,4 @@ public: std::vector<float>& a); }; -#endif //AUD_BUTTERWORTHFACTORY +#endif //__AUD_BUTTERWORTHFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h b/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h index 787fd49b600..7ced73844c9 100644 --- a/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h +++ b/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CALLBACKIIRFILTERREADER -#define AUD_CALLBACKIIRFILTERREADER +#ifndef __AUD_CALLBACKIIRFILTERREADER_H__ +#define __AUD_CALLBACKIIRFILTERREADER_H__ #include "AUD_BaseIIRFilterReader.h" #include "AUD_Buffer.h" @@ -84,4 +84,4 @@ public: virtual sample_t filter(); }; -#endif //AUD_CALLBACKIIRFILTERREADER +#endif //__AUD_CALLBACKIIRFILTERREADER_H__ diff --git a/intern/audaspace/FX/AUD_DelayFactory.h b/intern/audaspace/FX/AUD_DelayFactory.h index c1b114638f6..26855a05d70 100644 --- a/intern/audaspace/FX/AUD_DelayFactory.h +++ b/intern/audaspace/FX/AUD_DelayFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_DELAYFACTORY -#define AUD_DELAYFACTORY +#ifndef __AUD_DELAYFACTORY_H__ +#define __AUD_DELAYFACTORY_H__ #include "AUD_EffectFactory.h" @@ -63,4 +63,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_DELAYFACTORY +#endif //__AUD_DELAYFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_DelayReader.h b/intern/audaspace/FX/AUD_DelayReader.h index b23bb1438d1..9d9b6619470 100644 --- a/intern/audaspace/FX/AUD_DelayReader.h +++ b/intern/audaspace/FX/AUD_DelayReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_DELAYREADER -#define AUD_DELAYREADER +#ifndef __AUD_DELAYREADER_H__ +#define __AUD_DELAYREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -67,4 +67,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_DELAYREADER +#endif //__AUD_DELAYREADER_H__ diff --git a/intern/audaspace/FX/AUD_DoubleFactory.h b/intern/audaspace/FX/AUD_DoubleFactory.h index 990c605b2fb..e4d8fbfde8f 100644 --- a/intern/audaspace/FX/AUD_DoubleFactory.h +++ b/intern/audaspace/FX/AUD_DoubleFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_DOUBLEFACTORY -#define AUD_DOUBLEFACTORY +#ifndef __AUD_DOUBLEFACTORY_H__ +#define __AUD_DOUBLEFACTORY_H__ #include "AUD_IFactory.h" @@ -63,4 +63,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_DOUBLEFACTORY +#endif //__AUD_DOUBLEFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_DoubleReader.h b/intern/audaspace/FX/AUD_DoubleReader.h index 4c82d4f85ca..1489f4eb184 100644 --- a/intern/audaspace/FX/AUD_DoubleReader.h +++ b/intern/audaspace/FX/AUD_DoubleReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_DOUBLEREADER -#define AUD_DOUBLEREADER +#ifndef __AUD_DOUBLEREADER_H__ +#define __AUD_DOUBLEREADER_H__ #include "AUD_IReader.h" #include "AUD_Buffer.h" @@ -80,4 +80,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_DOUBLEREADER +#endif //__AUD_DOUBLEREADER_H__ diff --git a/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h b/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h index 2b63e275f0e..fef379f68b1 100644 --- a/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h +++ b/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h @@ -26,8 +26,8 @@ * \ingroup audfx */ -#ifndef AUD_DYNAMICIIRFILTERFACTORY -#define AUD_DYNAMICIIRFILTERFACTORY +#ifndef __AUD_DYNAMICIIRFILTERFACTORY_H__ +#define __AUD_DYNAMICIIRFILTERFACTORY_H__ #include "AUD_EffectFactory.h" #include <vector> @@ -60,4 +60,4 @@ public: std::vector<float>& a)=0; }; -#endif // AUD_DYNAMICIIRFILTERFACTORY +#endif // __AUD_DYNAMICIIRFILTERFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h b/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h index 843cf120011..8a53c15b18f 100644 --- a/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h +++ b/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h @@ -26,8 +26,8 @@ * \ingroup audfx */ -#ifndef AUD_DYNAMICIIRFILTERREADER -#define AUD_DYNAMICIIRFILTERREADER +#ifndef __AUD_DYNAMICIIRFILTERREADER_H__ +#define __AUD_DYNAMICIIRFILTERREADER_H__ #include "AUD_IIRFilterReader.h" #include "AUD_DynamicIIRFilterFactory.h" @@ -51,4 +51,4 @@ public: virtual void sampleRateChanged(AUD_SampleRate rate); }; -#endif // AUD_DYNAMICIIRFILTERREADER +#endif // __AUD_DYNAMICIIRFILTERREADER_H__ diff --git a/intern/audaspace/FX/AUD_EffectFactory.h b/intern/audaspace/FX/AUD_EffectFactory.h index 26d66634d7d..c8d26a1daa7 100644 --- a/intern/audaspace/FX/AUD_EffectFactory.h +++ b/intern/audaspace/FX/AUD_EffectFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_EFFECTFACTORY -#define AUD_EFFECTFACTORY +#ifndef __AUD_EFFECTFACTORY_H__ +#define __AUD_EFFECTFACTORY_H__ #include "AUD_IFactory.h" @@ -79,4 +79,4 @@ public: AUD_Reference<AUD_IFactory> getFactory() const; }; -#endif //AUD_EFFECTFACTORY +#endif //__AUD_EFFECTFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_EffectReader.h b/intern/audaspace/FX/AUD_EffectReader.h index 707031c55ad..b089ec9a318 100644 --- a/intern/audaspace/FX/AUD_EffectReader.h +++ b/intern/audaspace/FX/AUD_EffectReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_EFFECTREADER -#define AUD_EFFECTREADER +#ifndef __AUD_EFFECTREADER_H__ +#define __AUD_EFFECTREADER_H__ #include "AUD_IReader.h" #include "AUD_Reference.h" @@ -70,4 +70,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_EFFECTREADER +#endif //__AUD_EFFECTREADER_H__ diff --git a/intern/audaspace/FX/AUD_EnvelopeFactory.h b/intern/audaspace/FX/AUD_EnvelopeFactory.h index 81038f15560..c8f3dc37cd2 100644 --- a/intern/audaspace/FX/AUD_EnvelopeFactory.h +++ b/intern/audaspace/FX/AUD_EnvelopeFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_ENVELOPEFACTORY -#define AUD_ENVELOPEFACTORY +#ifndef __AUD_ENVELOPEFACTORY_H__ +#define __AUD_ENVELOPEFACTORY_H__ #include "AUD_EffectFactory.h" class AUD_CallbackIIRFilterReader; @@ -82,4 +82,4 @@ public: static void endEnvelopeFilter(EnvelopeParameters* param); }; -#endif //AUD_ENVELOPEFACTORY +#endif //__AUD_ENVELOPEFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_FaderFactory.h b/intern/audaspace/FX/AUD_FaderFactory.h index 7a8954d9e48..8fcd4baa623 100644 --- a/intern/audaspace/FX/AUD_FaderFactory.h +++ b/intern/audaspace/FX/AUD_FaderFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FADERFACTORY -#define AUD_FADERFACTORY +#ifndef __AUD_FADERFACTORY_H__ +#define __AUD_FADERFACTORY_H__ #include "AUD_EffectFactory.h" @@ -89,4 +89,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_FADERFACTORY +#endif //__AUD_FADERFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_FaderReader.h b/intern/audaspace/FX/AUD_FaderReader.h index 9cad72618ef..788e8539228 100644 --- a/intern/audaspace/FX/AUD_FaderReader.h +++ b/intern/audaspace/FX/AUD_FaderReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FADERREADER -#define AUD_FADERREADER +#ifndef __AUD_FADERREADER_H__ +#define __AUD_FADERREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -73,4 +73,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_FADERREADER +#endif //__AUD_FADERREADER_H__ diff --git a/intern/audaspace/FX/AUD_HighpassFactory.h b/intern/audaspace/FX/AUD_HighpassFactory.h index c9d8a0b017a..66aa8091234 100644 --- a/intern/audaspace/FX/AUD_HighpassFactory.h +++ b/intern/audaspace/FX/AUD_HighpassFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_HIGHPASSFACTORY -#define AUD_HIGHPASSFACTORY +#ifndef __AUD_HIGHPASSFACTORY_H__ +#define __AUD_HIGHPASSFACTORY_H__ #include "AUD_DynamicIIRFilterFactory.h" @@ -64,4 +64,4 @@ public: virtual void recalculateCoefficients(AUD_SampleRate rate, std::vector<float> &b, std::vector<float> &a); }; -#endif //AUD_HIGHPASSFACTORY +#endif //__AUD_HIGHPASSFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_IIRFilterFactory.h b/intern/audaspace/FX/AUD_IIRFilterFactory.h index 0b98f34f748..43256a166aa 100644 --- a/intern/audaspace/FX/AUD_IIRFilterFactory.h +++ b/intern/audaspace/FX/AUD_IIRFilterFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IIRFILTERFACTORY -#define AUD_IIRFILTERFACTORY +#ifndef __AUD_IIRFILTERFACTORY_H__ +#define __AUD_IIRFILTERFACTORY_H__ #include "AUD_EffectFactory.h" @@ -67,4 +67,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_IIRFILTERFACTORY +#endif //__AUD_IIRFILTERFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_IIRFilterReader.h b/intern/audaspace/FX/AUD_IIRFilterReader.h index 01a41385715..d9be52f2919 100644 --- a/intern/audaspace/FX/AUD_IIRFilterReader.h +++ b/intern/audaspace/FX/AUD_IIRFilterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IIRFILTERREADER -#define AUD_IIRFILTERREADER +#ifndef __AUD_IIRFILTERREADER_H__ +#define __AUD_IIRFILTERREADER_H__ #include "AUD_BaseIIRFilterReader.h" @@ -70,4 +70,4 @@ public: const std::vector<float>& a); }; -#endif //AUD_IIRFILTERREADER +#endif //__AUD_IIRFILTERREADER_H__ diff --git a/intern/audaspace/FX/AUD_LimiterFactory.h b/intern/audaspace/FX/AUD_LimiterFactory.h index 7128c6d7334..ddc8183ce7a 100644 --- a/intern/audaspace/FX/AUD_LimiterFactory.h +++ b/intern/audaspace/FX/AUD_LimiterFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LIMITERFACTORY -#define AUD_LIMITERFACTORY +#ifndef __AUD_LIMITERFACTORY_H__ +#define __AUD_LIMITERFACTORY_H__ #include "AUD_EffectFactory.h" @@ -76,4 +76,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_LIMITERFACTORY +#endif //__AUD_LIMITERFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_LimiterReader.h b/intern/audaspace/FX/AUD_LimiterReader.h index 7a2c88e5144..34c4ea7c20e 100644 --- a/intern/audaspace/FX/AUD_LimiterReader.h +++ b/intern/audaspace/FX/AUD_LimiterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LIMITERREADER -#define AUD_LIMITERREADER +#ifndef __AUD_LIMITERREADER_H__ +#define __AUD_LIMITERREADER_H__ #include "AUD_EffectReader.h" @@ -68,4 +68,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_LIMITERREADER +#endif //__AUD_LIMITERREADER_H__ diff --git a/intern/audaspace/FX/AUD_LoopFactory.h b/intern/audaspace/FX/AUD_LoopFactory.h index 7d794f313fb..754b780bd99 100644 --- a/intern/audaspace/FX/AUD_LoopFactory.h +++ b/intern/audaspace/FX/AUD_LoopFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LOOPFACTORY -#define AUD_LOOPFACTORY +#ifndef __AUD_LOOPFACTORY_H__ +#define __AUD_LOOPFACTORY_H__ #include "AUD_EffectFactory.h" @@ -65,4 +65,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_LOOPFACTORY +#endif //__AUD_LOOPFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_LoopReader.h b/intern/audaspace/FX/AUD_LoopReader.h index b062a1781a4..fd2dd71d78f 100644 --- a/intern/audaspace/FX/AUD_LoopReader.h +++ b/intern/audaspace/FX/AUD_LoopReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LOOPREADER -#define AUD_LOOPREADER +#ifndef __AUD_LOOPREADER_H__ +#define __AUD_LOOPREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -69,4 +69,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_LOOPREADER +#endif //__AUD_LOOPREADER_H__ diff --git a/intern/audaspace/FX/AUD_LowpassFactory.h b/intern/audaspace/FX/AUD_LowpassFactory.h index 90d6ac5c2d1..7e98720a2db 100644 --- a/intern/audaspace/FX/AUD_LowpassFactory.h +++ b/intern/audaspace/FX/AUD_LowpassFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LOWPASSFACTORY -#define AUD_LOWPASSFACTORY +#ifndef __AUD_LOWPASSFACTORY_H__ +#define __AUD_LOWPASSFACTORY_H__ #include "AUD_DynamicIIRFilterFactory.h" @@ -64,4 +64,4 @@ public: virtual void recalculateCoefficients(AUD_SampleRate rate, std::vector<float> &b, std::vector<float> &a); }; -#endif //AUD_LOWPASSFACTORY +#endif //__AUD_LOWPASSFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_PingPongFactory.h b/intern/audaspace/FX/AUD_PingPongFactory.h index 4a5f3fcf431..f25624a7c5e 100644 --- a/intern/audaspace/FX/AUD_PingPongFactory.h +++ b/intern/audaspace/FX/AUD_PingPongFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PINGPONGFACTORY -#define AUD_PINGPONGFACTORY +#ifndef __AUD_PINGPONGFACTORY_H__ +#define __AUD_PINGPONGFACTORY_H__ #include "AUD_EffectFactory.h" @@ -53,4 +53,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_PINGPONGFACTORY +#endif //__AUD_PINGPONGFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_PitchFactory.h b/intern/audaspace/FX/AUD_PitchFactory.h index c311a9e3446..5ad37ad1a6c 100644 --- a/intern/audaspace/FX/AUD_PitchFactory.h +++ b/intern/audaspace/FX/AUD_PitchFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PITCHFACTORY -#define AUD_PITCHFACTORY +#ifndef __AUD_PITCHFACTORY_H__ +#define __AUD_PITCHFACTORY_H__ #include "AUD_EffectFactory.h" @@ -58,4 +58,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_PITCHFACTORY +#endif //__AUD_PITCHFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_PitchReader.h b/intern/audaspace/FX/AUD_PitchReader.h index dcd23b747fa..3185bfdf30b 100644 --- a/intern/audaspace/FX/AUD_PitchReader.h +++ b/intern/audaspace/FX/AUD_PitchReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PITCHREADER -#define AUD_PITCHREADER +#ifndef __AUD_PITCHREADER_H__ +#define __AUD_PITCHREADER_H__ #include "AUD_EffectReader.h" @@ -70,4 +70,4 @@ public: void setPitch(float pitch); }; -#endif //AUD_PITCHREADER +#endif //__AUD_PITCHREADER_H__ diff --git a/intern/audaspace/FX/AUD_RectifyFactory.h b/intern/audaspace/FX/AUD_RectifyFactory.h index 2e3dbd17917..5ad41d424d9 100644 --- a/intern/audaspace/FX/AUD_RectifyFactory.h +++ b/intern/audaspace/FX/AUD_RectifyFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_RECTIFYFACTORY -#define AUD_RECTIFYFACTORY +#ifndef __AUD_RECTIFYFACTORY_H__ +#define __AUD_RECTIFYFACTORY_H__ #include "AUD_EffectFactory.h" class AUD_CallbackIIRFilterReader; @@ -55,4 +55,4 @@ public: static sample_t rectifyFilter(AUD_CallbackIIRFilterReader* reader, void* useless); }; -#endif //AUD_RECTIFYFACTORY +#endif //__AUD_RECTIFYFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_ReverseFactory.h b/intern/audaspace/FX/AUD_ReverseFactory.h index 6305fb5d2af..e2d75dc560a 100644 --- a/intern/audaspace/FX/AUD_ReverseFactory.h +++ b/intern/audaspace/FX/AUD_ReverseFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_REVERSEFACTORY -#define AUD_REVERSEFACTORY +#ifndef __AUD_REVERSEFACTORY_H__ +#define __AUD_REVERSEFACTORY_H__ #include "AUD_EffectFactory.h" @@ -53,4 +53,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_REVERSEFACTORY +#endif //__AUD_REVERSEFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_ReverseReader.h b/intern/audaspace/FX/AUD_ReverseReader.h index 1b3dfd7e53f..d1e5179b8ec 100644 --- a/intern/audaspace/FX/AUD_ReverseReader.h +++ b/intern/audaspace/FX/AUD_ReverseReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_REVERSEREADER -#define AUD_REVERSEREADER +#ifndef __AUD_REVERSEREADER_H__ +#define __AUD_REVERSEREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -69,4 +69,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_REVERSEREADER +#endif //__AUD_REVERSEREADER_H__ diff --git a/intern/audaspace/FX/AUD_SquareFactory.h b/intern/audaspace/FX/AUD_SquareFactory.h index aff24b0f3d9..9c0dea25d2b 100644 --- a/intern/audaspace/FX/AUD_SquareFactory.h +++ b/intern/audaspace/FX/AUD_SquareFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SQUAREFACTORY -#define AUD_SQUAREFACTORY +#ifndef __AUD_SQUAREFACTORY_H__ +#define __AUD_SQUAREFACTORY_H__ #include "AUD_EffectFactory.h" class AUD_CallbackIIRFilterReader; @@ -67,4 +67,4 @@ public: static void endSquareFilter(float* threshold); }; -#endif //AUD_SQUAREFACTORY +#endif //__AUD_SQUAREFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_SumFactory.h b/intern/audaspace/FX/AUD_SumFactory.h index c971730258a..ec17faf3fb2 100644 --- a/intern/audaspace/FX/AUD_SumFactory.h +++ b/intern/audaspace/FX/AUD_SumFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SUMFACTORY -#define AUD_SUMFACTORY +#ifndef __AUD_SUMFACTORY_H__ +#define __AUD_SUMFACTORY_H__ #include "AUD_EffectFactory.h" @@ -52,4 +52,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SUMFACTORY +#endif //__AUD_SUMFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_SuperposeFactory.h b/intern/audaspace/FX/AUD_SuperposeFactory.h index adfb1c23e1d..2da8e34496d 100644 --- a/intern/audaspace/FX/AUD_SuperposeFactory.h +++ b/intern/audaspace/FX/AUD_SuperposeFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SUPERPOSEFACTORY -#define AUD_SUPERPOSEFACTORY +#ifndef __AUD_SUPERPOSEFACTORY_H__ +#define __AUD_SUPERPOSEFACTORY_H__ #include "AUD_IFactory.h" @@ -65,4 +65,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SUPERPOSEFACTORY +#endif //__AUD_SUPERPOSEFACTORY_H__ diff --git a/intern/audaspace/FX/AUD_SuperposeReader.h b/intern/audaspace/FX/AUD_SuperposeReader.h index 8a1b2698f9c..d0fde13a267 100644 --- a/intern/audaspace/FX/AUD_SuperposeReader.h +++ b/intern/audaspace/FX/AUD_SuperposeReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SUPERPOSEREADER -#define AUD_SUPERPOSEREADER +#ifndef __AUD_SUPERPOSEREADER_H__ +#define __AUD_SUPERPOSEREADER_H__ #include "AUD_IReader.h" #include "AUD_Buffer.h" @@ -81,4 +81,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SUPERPOSEREADER +#endif //__AUD_SUPERPOSEREADER_H__ diff --git a/intern/audaspace/FX/AUD_VolumeFactory.h b/intern/audaspace/FX/AUD_VolumeFactory.h index ecfab6f7299..b12838373b3 100644 --- a/intern/audaspace/FX/AUD_VolumeFactory.h +++ b/intern/audaspace/FX/AUD_VolumeFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_VOLUMEFACTORY -#define AUD_VOLUMEFACTORY +#ifndef __AUD_VOLUMEFACTORY_H__ +#define __AUD_VOLUMEFACTORY_H__ #include "AUD_EffectFactory.h" @@ -66,4 +66,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_VOLUMEFACTORY +#endif //__AUD_VOLUMEFACTORY_H__ diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.h b/intern/audaspace/OpenAL/AUD_OpenALDevice.h index ff1361c283f..0a409b42462 100644 --- a/intern/audaspace/OpenAL/AUD_OpenALDevice.h +++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_OPENALDEVICE -#define AUD_OPENALDEVICE +#ifndef __AUD_OPENALDEVICE_H__ +#define __AUD_OPENALDEVICE_H__ #include "AUD_IDevice.h" #include "AUD_IHandle.h" @@ -277,4 +277,4 @@ public: virtual void setDistanceModel(AUD_DistanceModel model); }; -#endif //AUD_OPENALDEVICE +#endif //__AUD_OPENALDEVICE_H__ diff --git a/intern/audaspace/Python/AUD_PyAPI.h b/intern/audaspace/Python/AUD_PyAPI.h index bcd9e42ede1..7a7e87ec67d 100644 --- a/intern/audaspace/Python/AUD_PyAPI.h +++ b/intern/audaspace/Python/AUD_PyAPI.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PYAPI -#define AUD_PYAPI +#ifndef __AUD_PYAPI_H__ +#define __AUD_PYAPI_H__ #include "Python.h" @@ -71,4 +71,4 @@ extern Factory* checkFactory(PyObject* factory); } #endif -#endif //AUD_PYAPI +#endif //__AUD_PYAPI_H__ diff --git a/intern/audaspace/SDL/AUD_SDLDevice.h b/intern/audaspace/SDL/AUD_SDLDevice.h index d77d5835086..266edd0dfcc 100644 --- a/intern/audaspace/SDL/AUD_SDLDevice.h +++ b/intern/audaspace/SDL/AUD_SDLDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SDLDEVICE -#define AUD_SDLDEVICE +#ifndef __AUD_SDLDEVICE_H__ +#define __AUD_SDLDEVICE_H__ #include "AUD_SoftwareDevice.h" @@ -72,4 +72,4 @@ public: virtual ~AUD_SDLDevice(); }; -#endif //AUD_SDLDEVICE +#endif //__AUD_SDLDEVICE_H__ diff --git a/intern/audaspace/SRC/AUD_SRCResampleFactory.h b/intern/audaspace/SRC/AUD_SRCResampleFactory.h index d061cf9e12b..858bb0c130a 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleFactory.h +++ b/intern/audaspace/SRC/AUD_SRCResampleFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SRCRESAMPLEFACTORY -#define AUD_SRCRESAMPLEFACTORY +#ifndef __AUD_SRCRESAMPLEFACTORY_H__ +#define __AUD_SRCRESAMPLEFACTORY_H__ #include "AUD_MixerFactory.h" @@ -54,4 +54,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SRCRESAMPLEFACTORY +#endif //__AUD_SRCRESAMPLEFACTORY_H__ diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.h b/intern/audaspace/SRC/AUD_SRCResampleReader.h index 26f02be9003..891b28b0993 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleReader.h +++ b/intern/audaspace/SRC/AUD_SRCResampleReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SRCRESAMPLEREADER -#define AUD_SRCRESAMPLEREADER +#ifndef __AUD_SRCRESAMPLEREADER_H__ +#define __AUD_SRCRESAMPLEREADER_H__ #include "AUD_ResampleReader.h" #include "AUD_Buffer.h" @@ -100,4 +100,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SRCRESAMPLEREADER +#endif //__AUD_SRCRESAMPLEREADER_H__ diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h index 9d79a5fad23..349f55dd7db 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FFMPEGFACTORY -#define AUD_FFMPEGFACTORY +#ifndef __AUD_FFMPEGFACTORY_H__ +#define __AUD_FFMPEGFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_Reference.h" @@ -75,4 +75,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_FFMPEGFACTORY +#endif //__AUD_FFMPEGFACTORY_H__ diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h index 9a19131efe0..2b354b0b2a1 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FFMPEGREADER -#define AUD_FFMPEGREADER +#ifndef __AUD_FFMPEGREADER_H__ +#define __AUD_FFMPEGREADER_H__ #include "AUD_ConverterFunctions.h" #include "AUD_IReader.h" @@ -161,4 +161,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_FFMPEGREADER +#endif //__AUD_FFMPEGREADER_H__ diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h index 60200ce363d..17830308fd5 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FFMPEGWRITER -#define AUD_FFMPEGWRITER +#ifndef __AUD_FFMPEGWRITER_H__ +#define __AUD_FFMPEGWRITER_H__ #include "AUD_ConverterFunctions.h" #include "AUD_Buffer.h" @@ -135,4 +135,4 @@ public: virtual void write(unsigned int length, sample_t* buffer); }; -#endif //AUD_FFMPEGWRITER +#endif //__AUD_FFMPEGWRITER_H__ diff --git a/intern/audaspace/fftw/AUD_BandPassFactory.h b/intern/audaspace/fftw/AUD_BandPassFactory.h index 4891947ec3c..75de071403f 100644 --- a/intern/audaspace/fftw/AUD_BandPassFactory.h +++ b/intern/audaspace/fftw/AUD_BandPassFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BANDPASSFACTORY -#define AUD_BANDPASSFACTORY +#ifndef __AUD_BANDPASSFACTORY_H__ +#define __AUD_BANDPASSFACTORY_H__ #include "AUD_EffectFactory.h" @@ -89,4 +89,4 @@ public: virtual AUD_IReader* createReader(); }; -#endif //AUD_BANDPASSFACTORY +#endif //__AUD_BANDPASSFACTORY_H__ diff --git a/intern/audaspace/fftw/AUD_BandPassReader.h b/intern/audaspace/fftw/AUD_BandPassReader.h index 155b8d7b0bc..55a950818e0 100644 --- a/intern/audaspace/fftw/AUD_BandPassReader.h +++ b/intern/audaspace/fftw/AUD_BandPassReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BANDPASSREADER -#define AUD_BANDPASSREADER +#ifndef __AUD_BANDPASSREADER_H__ +#define __AUD_BANDPASSREADER_H__ #include <fftw3.h> @@ -99,4 +99,4 @@ public: virtual void read(int & length, sample_t* & buffer); }; -#endif //AUD_BANDPASSREADER +#endif //__AUD_BANDPASSREADER_H__ diff --git a/intern/audaspace/intern/AUD_3DMath.h b/intern/audaspace/intern/AUD_3DMath.h index 18594842108..f39566958cd 100644 --- a/intern/audaspace/intern/AUD_3DMath.h +++ b/intern/audaspace/intern/AUD_3DMath.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_3DMATH -#define AUD_3DMATH +#ifndef __AUD_3DMATH_H__ +#define __AUD_3DMATH_H__ #include <cmath> #include <cstring> @@ -325,4 +325,4 @@ public: } }; -#endif //AUD_3DMATH +#endif //__AUD_3DMATH_H__ diff --git a/intern/audaspace/intern/AUD_AnimateableProperty.h b/intern/audaspace/intern/AUD_AnimateableProperty.h index 5b516384a8f..2f25e330ebd 100644 --- a/intern/audaspace/intern/AUD_AnimateableProperty.h +++ b/intern/audaspace/intern/AUD_AnimateableProperty.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_ANIMATEABLEPROPERTY -#define AUD_ANIMATEABLEPROPERTY +#ifndef __AUD_ANIMATEABLEPROPERTY_H__ +#define __AUD_ANIMATEABLEPROPERTY_H__ #include "AUD_Buffer.h" @@ -103,4 +103,4 @@ public: bool isAnimated() const; }; -#endif //AUD_ANIMATEABLEPROPERTY +#endif //__AUD_ANIMATEABLEPROPERTY_H__ diff --git a/intern/audaspace/intern/AUD_Buffer.h b/intern/audaspace/intern/AUD_Buffer.h index 7a30d3b02d8..d3207f04f83 100644 --- a/intern/audaspace/intern/AUD_Buffer.h +++ b/intern/audaspace/intern/AUD_Buffer.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BUFFER -#define AUD_BUFFER +#ifndef __AUD_BUFFER_H__ +#define __AUD_BUFFER_H__ #include "AUD_Space.h" @@ -90,4 +90,4 @@ public: void assureSize(int size, bool keep = false); }; -#endif //AUD_BUFFER +#endif //__AUD_BUFFER_H__ diff --git a/intern/audaspace/intern/AUD_BufferReader.h b/intern/audaspace/intern/AUD_BufferReader.h index f648baef30d..0e8c5de9a9d 100644 --- a/intern/audaspace/intern/AUD_BufferReader.h +++ b/intern/audaspace/intern/AUD_BufferReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_BUFFERREADER -#define AUD_BUFFERREADER +#ifndef __AUD_BUFFERREADER_H__ +#define __AUD_BUFFERREADER_H__ #include "AUD_IReader.h" #include "AUD_Reference.h" @@ -77,4 +77,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_BUFFERREADER +#endif //__AUD_BUFFERREADER_H__ diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h index 2b7c94bcc5b..8388af2170d 100644 --- a/intern/audaspace/intern/AUD_C-API.h +++ b/intern/audaspace/intern/AUD_C-API.h @@ -26,8 +26,8 @@ * \ingroup audaspace */ -#ifndef AUD_CAPI -#define AUD_CAPI +#ifndef __AUD_C_API_H__ +#define __AUD_C_API_H__ #ifdef WITH_PYTHON #include "Python.h" @@ -755,4 +755,4 @@ AUD_Reference<AUD_IDevice> AUD_getDevice(); AUD_I3DDevice* AUD_get3DDevice(); #endif -#endif //AUD_CAPI +#endif //__AUD_C_API_H__ diff --git a/intern/audaspace/intern/AUD_ChannelMapperFactory.h b/intern/audaspace/intern/AUD_ChannelMapperFactory.h index 4c88cb85080..b60a32d5510 100644 --- a/intern/audaspace/intern/AUD_ChannelMapperFactory.h +++ b/intern/audaspace/intern/AUD_ChannelMapperFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CHANNELMAPPERFACTORY -#define AUD_CHANNELMAPPERFACTORY +#ifndef __AUD_CHANNELMAPPERFACTORY_H__ +#define __AUD_CHANNELMAPPERFACTORY_H__ #include "AUD_MixerFactory.h" @@ -54,4 +54,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_CHANNELMAPPERFACTORY +#endif //__AUD_CHANNELMAPPERFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_ChannelMapperReader.h b/intern/audaspace/intern/AUD_ChannelMapperReader.h index 8e3ff0d1e9a..32adb058115 100644 --- a/intern/audaspace/intern/AUD_ChannelMapperReader.h +++ b/intern/audaspace/intern/AUD_ChannelMapperReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CHANNELMAPPERREADER -#define AUD_CHANNELMAPPERREADER +#ifndef __AUD_CHANNELMAPPERREADER_H__ +#define __AUD_CHANNELMAPPERREADER_H__ #include "AUD_EffectReader.h" #include "AUD_Buffer.h" @@ -133,4 +133,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_CHANNELMAPPERREADER +#endif //__AUD_CHANNELMAPPERREADER_H__ diff --git a/intern/audaspace/intern/AUD_ConverterFactory.h b/intern/audaspace/intern/AUD_ConverterFactory.h index 04dfe9e12d1..3211b607517 100644 --- a/intern/audaspace/intern/AUD_ConverterFactory.h +++ b/intern/audaspace/intern/AUD_ConverterFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CONVERTERFACTORY -#define AUD_CONVERTERFACTORY +#ifndef __AUD_CONVERTERFACTORY_H__ +#define __AUD_CONVERTERFACTORY_H__ #include "AUD_MixerFactory.h" @@ -54,4 +54,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_CONVERTERFACTORY +#endif //__AUD_CONVERTERFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_ConverterFunctions.cpp b/intern/audaspace/intern/AUD_ConverterFunctions.cpp index 53a644e3b90..c20f19a7e67 100644 --- a/intern/audaspace/intern/AUD_ConverterFunctions.cpp +++ b/intern/audaspace/intern/AUD_ConverterFunctions.cpp @@ -31,11 +31,11 @@ #include "AUD_Buffer.h" #define AUD_U8_0 0x80 -#define AUD_S16_MAX 0x7FFF -#define AUD_S16_MIN 0x8000 +#define AUD_S16_MAX ((int16_t)0x7FFF) +#define AUD_S16_MIN ((int16_t)0x8000) #define AUD_S16_FLT 32767.0f -#define AUD_S32_MAX 0x7FFFFFFF -#define AUD_S32_MIN 0x80000000 +#define AUD_S32_MAX ((int32_t)0x7FFFFFFF) +#define AUD_S32_MIN ((int32_t)0x80000000) #define AUD_S32_FLT 2147483647.0f #define AUD_FLT_MAX 1.0f #define AUD_FLT_MIN -1.0f diff --git a/intern/audaspace/intern/AUD_ConverterFunctions.h b/intern/audaspace/intern/AUD_ConverterFunctions.h index 35a8012ccd1..1ffcf6c4ef0 100644 --- a/intern/audaspace/intern/AUD_ConverterFunctions.h +++ b/intern/audaspace/intern/AUD_ConverterFunctions.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CONVERTERFUNCTIONS -#define AUD_CONVERTERFUNCTIONS +#ifndef __AUD_CONVERTERFUNCTIONS_H__ +#define __AUD_CONVERTERFUNCTIONS_H__ #include "AUD_Space.h" @@ -135,4 +135,4 @@ void AUD_convert_double_s32(data_t* target, data_t* source, int length); void AUD_convert_double_float(data_t* target, data_t* source, int length); -#endif //AUD_CONVERTERFUNCTIONS +#endif //__AUD_CONVERTERFUNCTIONS_H__ diff --git a/intern/audaspace/intern/AUD_ConverterReader.h b/intern/audaspace/intern/AUD_ConverterReader.h index 984666453e8..2dedbd89180 100644 --- a/intern/audaspace/intern/AUD_ConverterReader.h +++ b/intern/audaspace/intern/AUD_ConverterReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_CONVERTERREADER -#define AUD_CONVERTERREADER +#ifndef __AUD_CONVERTERREADER_H__ +#define __AUD_CONVERTERREADER_H__ #include "AUD_EffectReader.h" #include "AUD_ConverterFunctions.h" @@ -70,4 +70,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_CONVERTERREADER +#endif //__AUD_CONVERTERREADER_H__ diff --git a/intern/audaspace/intern/AUD_FileFactory.h b/intern/audaspace/intern/AUD_FileFactory.h index b39db27476b..4ea4a9392e9 100644 --- a/intern/audaspace/intern/AUD_FileFactory.h +++ b/intern/audaspace/intern/AUD_FileFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FILEFACTORY -#define AUD_FILEFACTORY +#ifndef __AUD_FILEFACTORY_H__ +#define __AUD_FILEFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_Reference.h" @@ -73,4 +73,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_FILEFACTORY +#endif //__AUD_FILEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_FileWriter.h b/intern/audaspace/intern/AUD_FileWriter.h index 9ff083e247f..c9ee2b1ee12 100644 --- a/intern/audaspace/intern/AUD_FileWriter.h +++ b/intern/audaspace/intern/AUD_FileWriter.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_FILEWRITER -#define AUD_FILEWRITER +#ifndef __AUD_FILEWRITER_H__ +#define __AUD_FILEWRITER_H__ #include <string> @@ -70,4 +70,4 @@ public: static void writeReader(AUD_Reference<AUD_IReader> reader, AUD_Reference<AUD_IWriter> writer, unsigned int length, unsigned int buffersize); }; -#endif //AUD_FILEWRITER +#endif //__AUD_FILEWRITER_H__ diff --git a/intern/audaspace/intern/AUD_I3DDevice.h b/intern/audaspace/intern/AUD_I3DDevice.h index 68052627842..1df710b7e5b 100644 --- a/intern/audaspace/intern/AUD_I3DDevice.h +++ b/intern/audaspace/intern/AUD_I3DDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_I3DDEVICE -#define AUD_I3DDEVICE +#ifndef __AUD_I3DDEVICE_H__ +#define __AUD_I3DDEVICE_H__ #include "AUD_Space.h" #include "AUD_3DMath.h" @@ -119,4 +119,4 @@ public: virtual void setDistanceModel(AUD_DistanceModel model)=0; }; -#endif //AUD_I3DDEVICE +#endif //__AUD_I3DDEVICE_H__ diff --git a/intern/audaspace/intern/AUD_I3DHandle.h b/intern/audaspace/intern/AUD_I3DHandle.h index 78be55db82c..69ca985630a 100644 --- a/intern/audaspace/intern/AUD_I3DHandle.h +++ b/intern/audaspace/intern/AUD_I3DHandle.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_I3DHANDLE -#define AUD_I3DHANDLE +#ifndef __AUD_I3DHANDLE_H__ +#define __AUD_I3DHANDLE_H__ #include "AUD_Space.h" #include "AUD_3DMath.h" @@ -213,4 +213,4 @@ public: virtual bool setConeVolumeOuter(float volume)=0; }; -#endif //AUD_I3DHANDLE +#endif //__AUD_I3DHANDLE_H__ diff --git a/intern/audaspace/intern/AUD_IDevice.h b/intern/audaspace/intern/AUD_IDevice.h index 28765e9144c..1d6f8ca6efb 100644 --- a/intern/audaspace/intern/AUD_IDevice.h +++ b/intern/audaspace/intern/AUD_IDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IDEVICE -#define AUD_IDEVICE +#ifndef __AUD_IDEVICE_H__ +#define __AUD_IDEVICE_H__ #include "AUD_Space.h" #include "AUD_Reference.h" diff --git a/intern/audaspace/intern/AUD_IFactory.h b/intern/audaspace/intern/AUD_IFactory.h index a19a5775dc9..a7c214bb5a1 100644 --- a/intern/audaspace/intern/AUD_IFactory.h +++ b/intern/audaspace/intern/AUD_IFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IFACTORY -#define AUD_IFACTORY +#ifndef __AUD_IFACTORY_H__ +#define __AUD_IFACTORY_H__ #include "AUD_Space.h" #include "AUD_Reference.h" @@ -57,4 +57,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader()=0; }; -#endif //AUD_IFACTORY +#endif //__AUD_IFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_IHandle.h b/intern/audaspace/intern/AUD_IHandle.h index 33c64f509c2..9dcb743693e 100644 --- a/intern/audaspace/intern/AUD_IHandle.h +++ b/intern/audaspace/intern/AUD_IHandle.h @@ -26,8 +26,8 @@ * \ingroup audaspaceintern */ -#ifndef AUD_IHANDLE -#define AUD_IHANDLE +#ifndef __AUD_IHANDLE_H__ +#define __AUD_IHANDLE_H__ //#include "AUD_Space.h" //#include "AUD_Reference.h" diff --git a/intern/audaspace/intern/AUD_IReader.h b/intern/audaspace/intern/AUD_IReader.h index 2c92e75163e..8e0e03dd95d 100644 --- a/intern/audaspace/intern/AUD_IReader.h +++ b/intern/audaspace/intern/AUD_IReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IREADER -#define AUD_IREADER +#ifndef __AUD_IREADER_H__ +#define __AUD_IREADER_H__ #include "AUD_Space.h" @@ -94,4 +94,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer)=0; }; -#endif //AUD_IREADER +#endif //__AUD_IREADER_H__ diff --git a/intern/audaspace/intern/AUD_IWriter.h b/intern/audaspace/intern/AUD_IWriter.h index 401faea4813..3c92661c75d 100644 --- a/intern/audaspace/intern/AUD_IWriter.h +++ b/intern/audaspace/intern/AUD_IWriter.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_IWRITER -#define AUD_IWRITER +#ifndef __AUD_IWRITER_H__ +#define __AUD_IWRITER_H__ #include "AUD_Space.h" @@ -64,4 +64,4 @@ public: virtual void write(unsigned int length, sample_t* buffer)=0; }; -#endif //AUD_IWRITER +#endif //__AUD_IWRITER_H__ diff --git a/intern/audaspace/intern/AUD_JOSResampleFactory.h b/intern/audaspace/intern/AUD_JOSResampleFactory.h index a4a303f944d..6d18150d852 100644 --- a/intern/audaspace/intern/AUD_JOSResampleFactory.h +++ b/intern/audaspace/intern/AUD_JOSResampleFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_JOSRESAMPLEFACTORY -#define AUD_JOSRESAMPLEFACTORY +#ifndef __AUD_JOSRESAMPLEFACTORY_H__ +#define __AUD_JOSRESAMPLEFACTORY_H__ #include "AUD_MixerFactory.h" @@ -53,4 +53,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_JOSRESAMPLEFACTORY +#endif //__AUD_JOSRESAMPLEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_JOSResampleReader.cpp b/intern/audaspace/intern/AUD_JOSResampleReader.cpp index 2fb8b86ce49..0f7a038c88e 100644 --- a/intern/audaspace/intern/AUD_JOSResampleReader.cpp +++ b/intern/audaspace/intern/AUD_JOSResampleReader.cpp @@ -200,7 +200,7 @@ void AUD_JOSResampleReader::updateBuffer(int size, double factor, int samplesize left\ }\ \ - P = -P;\ + P = 0 - P;\ \ end = (int_to_fp(m_len) - P) / P_increment - 1;\ if(m_cache_valid - m_n - 2 < end)\ diff --git a/intern/audaspace/intern/AUD_JOSResampleReader.h b/intern/audaspace/intern/AUD_JOSResampleReader.h index c05a160c2da..94524c1db3e 100644 --- a/intern/audaspace/intern/AUD_JOSResampleReader.h +++ b/intern/audaspace/intern/AUD_JOSResampleReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_JOSRESAMPLEREADER -#define AUD_JOSRESAMPLEREADER +#ifndef __AUD_JOSRESAMPLEREADER_H__ +#define __AUD_JOSRESAMPLEREADER_H__ #include "AUD_ResampleReader.h" #include "AUD_Buffer.h" @@ -132,4 +132,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_JOSRESAMPLEREADER +#endif //__AUD_JOSRESAMPLEREADER_H__ diff --git a/intern/audaspace/intern/AUD_LinearResampleFactory.h b/intern/audaspace/intern/AUD_LinearResampleFactory.h index e1e9cc7ec22..7d9efa01d2d 100644 --- a/intern/audaspace/intern/AUD_LinearResampleFactory.h +++ b/intern/audaspace/intern/AUD_LinearResampleFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LINEARRESAMPLEFACTORY -#define AUD_LINEARRESAMPLEFACTORY +#ifndef __AUD_LINEARRESAMPLEFACTORY_H__ +#define __AUD_LINEARRESAMPLEFACTORY_H__ #include "AUD_MixerFactory.h" @@ -53,4 +53,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_LINEARRESAMPLEFACTORY +#endif //__AUD_LINEARRESAMPLEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_LinearResampleReader.h b/intern/audaspace/intern/AUD_LinearResampleReader.h index 1370825894b..4f6d422f772 100644 --- a/intern/audaspace/intern/AUD_LinearResampleReader.h +++ b/intern/audaspace/intern/AUD_LinearResampleReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_LINEARRESAMPLEREADER -#define AUD_LINEARRESAMPLEREADER +#ifndef __AUD_LINEARRESAMPLEREADER_H__ +#define __AUD_LINEARRESAMPLEREADER_H__ #include "AUD_ResampleReader.h" #include "AUD_Buffer.h" @@ -83,4 +83,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_LINEARRESAMPLEREADER +#endif //__AUD_LINEARRESAMPLEREADER_H__ diff --git a/intern/audaspace/intern/AUD_Mixer.h b/intern/audaspace/intern/AUD_Mixer.h index e1b67aca5ff..0de9b7fc7dc 100644 --- a/intern/audaspace/intern/AUD_Mixer.h +++ b/intern/audaspace/intern/AUD_Mixer.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_MIXER -#define AUD_MIXER +#ifndef __AUD_MIXER_H__ +#define __AUD_MIXER_H__ #include "AUD_ConverterFunctions.h" #include "AUD_Buffer.h" @@ -108,4 +108,4 @@ public: void clear(int length); }; -#endif //AUD_MIXER +#endif //__AUD_MIXER_H__ diff --git a/intern/audaspace/intern/AUD_MixerFactory.h b/intern/audaspace/intern/AUD_MixerFactory.h index e3627de5b66..d65eb8ef6ae 100644 --- a/intern/audaspace/intern/AUD_MixerFactory.h +++ b/intern/audaspace/intern/AUD_MixerFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_MIXERFACTORY -#define AUD_MIXERFACTORY +#ifndef __AUD_MIXERFACTORY_H__ +#define __AUD_MIXERFACTORY_H__ #include "AUD_IFactory.h" @@ -76,4 +76,4 @@ public: AUD_Reference<AUD_IFactory> getFactory() const; }; -#endif //AUD_MIXERFACTORY +#endif //__AUD_MIXERFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_NULLDevice.h b/intern/audaspace/intern/AUD_NULLDevice.h index 6ac8efd227e..ee97b151ebe 100644 --- a/intern/audaspace/intern/AUD_NULLDevice.h +++ b/intern/audaspace/intern/AUD_NULLDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_NULLDEVICE -#define AUD_NULLDEVICE +#ifndef __AUD_NULLDEVICE_H__ +#define __AUD_NULLDEVICE_H__ #include "AUD_IReader.h" #include "AUD_IDevice.h" @@ -81,4 +81,4 @@ public: virtual void setVolume(float volume); }; -#endif //AUD_NULLDEVICE +#endif //__AUD_NULLDEVICE_H__ diff --git a/intern/audaspace/intern/AUD_PyInit.h b/intern/audaspace/intern/AUD_PyInit.h index dc24571438e..8c045e60f37 100644 --- a/intern/audaspace/intern/AUD_PyInit.h +++ b/intern/audaspace/intern/AUD_PyInit.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_PYINIT -#define AUD_PYINIT +#ifndef __AUD_PYINIT_H__ +#define __AUD_PYINIT_H__ #ifdef WITH_PYTHON #include "Python.h" @@ -48,4 +48,4 @@ extern PyObject* AUD_initPython(void); #endif -#endif //AUD_PYINIT +#endif //__AUD_PYINIT_H__ diff --git a/intern/audaspace/intern/AUD_ReadDevice.h b/intern/audaspace/intern/AUD_ReadDevice.h index 9e362b42d36..0f077fe5d7e 100644 --- a/intern/audaspace/intern/AUD_ReadDevice.h +++ b/intern/audaspace/intern/AUD_ReadDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_READDEVICE -#define AUD_READDEVICE +#ifndef __AUD_READDEVICE_H__ +#define __AUD_READDEVICE_H__ #include "AUD_SoftwareDevice.h" @@ -85,4 +85,4 @@ public: void changeSpecs(AUD_Specs specs); }; -#endif //AUD_READDEVICE +#endif //__AUD_READDEVICE_H__ diff --git a/intern/audaspace/intern/AUD_Reference.h b/intern/audaspace/intern/AUD_Reference.h index 0d1c754f908..2e07417154b 100644 --- a/intern/audaspace/intern/AUD_Reference.h +++ b/intern/audaspace/intern/AUD_Reference.h @@ -26,8 +26,8 @@ * \ingroup audaspaceintern */ -#ifndef AUD_REFERENCE -#define AUD_REFERENCE +#ifndef __AUD_REFERENCE_H__ +#define __AUD_REFERENCE_H__ #include <map> #include <cstddef> @@ -244,4 +244,4 @@ inline bool operator!=(const AUD_Reference<T>& a, const AUD_Reference<U>& b) return a.getOriginal() != b.getOriginal(); } -#endif // AUD_REFERENCE +#endif // __AUD_REFERENCE_H__ diff --git a/intern/audaspace/intern/AUD_ResampleFactory.h b/intern/audaspace/intern/AUD_ResampleFactory.h index 34549c16dfa..11f8dc15f03 100644 --- a/intern/audaspace/intern/AUD_ResampleFactory.h +++ b/intern/audaspace/intern/AUD_ResampleFactory.h @@ -27,11 +27,11 @@ */ -#ifndef AUD_RESAMPLEFACTORY -#define AUD_RESAMPLEFACTORY +#ifndef __AUD_RESAMPLEFACTORY_H__ +#define __AUD_RESAMPLEFACTORY_H__ #include "AUD_MixerFactory.h" typedef AUD_MixerFactory AUD_ResampleFactory; -#endif //AUD_RESAMPLEFACTORY +#endif //__AUD_RESAMPLEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_ResampleReader.h b/intern/audaspace/intern/AUD_ResampleReader.h index 9c3e671f664..c423326489d 100644 --- a/intern/audaspace/intern/AUD_ResampleReader.h +++ b/intern/audaspace/intern/AUD_ResampleReader.h @@ -26,8 +26,8 @@ * \ingroup audaspaceintern */ -#ifndef AUD_RESAMPLEREADER -#define AUD_RESAMPLEREADER +#ifndef __AUD_RESAMPLEREADER_H__ +#define __AUD_RESAMPLEREADER_H__ #include "AUD_EffectReader.h" @@ -63,4 +63,4 @@ public: virtual AUD_SampleRate getRate(); }; -#endif // AUD_RESAMPLEREADER +#endif // __AUD_RESAMPLEREADER_H__ diff --git a/intern/audaspace/intern/AUD_SequencerEntry.h b/intern/audaspace/intern/AUD_SequencerEntry.h index 3a5a51a41a5..7ff6fffea11 100644 --- a/intern/audaspace/intern/AUD_SequencerEntry.h +++ b/intern/audaspace/intern/AUD_SequencerEntry.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SEQUENCERENTRY -#define AUD_SEQUENCERENTRY +#ifndef __AUD_SEQUENCERENTRY_H__ +#define __AUD_SEQUENCERENTRY_H__ #include "AUD_Reference.h" #include "AUD_AnimateableProperty.h" @@ -315,4 +315,4 @@ public: void setConeVolumeOuter(float volume); }; -#endif //AUD_SEQUENCERENTRY +#endif //__AUD_SEQUENCERENTRY_H__ diff --git a/intern/audaspace/intern/AUD_SequencerFactory.h b/intern/audaspace/intern/AUD_SequencerFactory.h index 08d18fcc925..38241112020 100644 --- a/intern/audaspace/intern/AUD_SequencerFactory.h +++ b/intern/audaspace/intern/AUD_SequencerFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SEQUENCERFACTORY -#define AUD_SEQUENCERFACTORY +#ifndef __AUD_SEQUENCERFACTORY_H__ +#define __AUD_SEQUENCERFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_AnimateableProperty.h" @@ -210,4 +210,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SEQUENCERFACTORY +#endif //__AUD_SEQUENCERFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_SequencerHandle.h b/intern/audaspace/intern/AUD_SequencerHandle.h index c7fd3f026eb..72d3240a103 100644 --- a/intern/audaspace/intern/AUD_SequencerHandle.h +++ b/intern/audaspace/intern/AUD_SequencerHandle.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SEQUENCERHANDLE -#define AUD_SEQUENCERHANDLE +#ifndef __AUD_SEQUENCERHANDLE_H__ +#define __AUD_SEQUENCERHANDLE_H__ #include "AUD_SequencerEntry.h" #include "AUD_IHandle.h" @@ -103,4 +103,4 @@ public: void seek(float position); }; -#endif //AUD_SEQUENCERHANDLE +#endif //__AUD_SEQUENCERHANDLE_H__ diff --git a/intern/audaspace/intern/AUD_SequencerReader.cpp b/intern/audaspace/intern/AUD_SequencerReader.cpp index 44df66ccc3a..7c8fe9eef4e 100644 --- a/intern/audaspace/intern/AUD_SequencerReader.cpp +++ b/intern/audaspace/intern/AUD_SequencerReader.cpp @@ -176,6 +176,8 @@ void AUD_SequencerReader::read(int& length, bool& eos, sample_t* buffer) } m_factory->m_volume.read(frame, &volume); + if(m_factory->m_muted) + volume = 0.0f; m_device.setVolume(volume); m_factory->m_orientation.read(frame, q.get()); diff --git a/intern/audaspace/intern/AUD_SequencerReader.h b/intern/audaspace/intern/AUD_SequencerReader.h index a4120830e42..b3c3a3ea7a6 100644 --- a/intern/audaspace/intern/AUD_SequencerReader.h +++ b/intern/audaspace/intern/AUD_SequencerReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SEQUENCERREADER -#define AUD_SEQUENCERREADER +#ifndef __AUD_SEQUENCERREADER_H__ +#define __AUD_SEQUENCERREADER_H__ #include "AUD_IReader.h" #include "AUD_ReadDevice.h" @@ -96,4 +96,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SEQUENCERREADER +#endif //__AUD_SEQUENCERREADER_H__ diff --git a/intern/audaspace/intern/AUD_SilenceFactory.h b/intern/audaspace/intern/AUD_SilenceFactory.h index d1b0f9d6550..3bc7fc067ed 100644 --- a/intern/audaspace/intern/AUD_SilenceFactory.h +++ b/intern/audaspace/intern/AUD_SilenceFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SILENCEFACTORY -#define AUD_SILENCEFACTORY +#ifndef __AUD_SILENCEFACTORY_H__ +#define __AUD_SILENCEFACTORY_H__ #include "AUD_IFactory.h" @@ -51,4 +51,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SILENCEFACTORY +#endif //__AUD_SILENCEFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_SilenceReader.h b/intern/audaspace/intern/AUD_SilenceReader.h index de4f9df51fb..cac56a0861b 100644 --- a/intern/audaspace/intern/AUD_SilenceReader.h +++ b/intern/audaspace/intern/AUD_SilenceReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SILENCEREADER -#define AUD_SILENCEREADER +#ifndef __AUD_SILENCEREADER_H__ +#define __AUD_SILENCEREADER_H__ #include "AUD_IReader.h" #include "AUD_Buffer.h" @@ -63,4 +63,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SILENCEREADER +#endif //__AUD_SILENCEREADER_H__ diff --git a/intern/audaspace/intern/AUD_SinusFactory.h b/intern/audaspace/intern/AUD_SinusFactory.h index f73cdd278b5..d83323c6635 100644 --- a/intern/audaspace/intern/AUD_SinusFactory.h +++ b/intern/audaspace/intern/AUD_SinusFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SINUSFACTORY -#define AUD_SINUSFACTORY +#ifndef __AUD_SINUSFACTORY_H__ +#define __AUD_SINUSFACTORY_H__ #include "AUD_IFactory.h" @@ -69,4 +69,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SINUSFACTORY +#endif //__AUD_SINUSFACTORY_H__ diff --git a/intern/audaspace/intern/AUD_SinusReader.h b/intern/audaspace/intern/AUD_SinusReader.h index ce79470c83d..50487ea94aa 100644 --- a/intern/audaspace/intern/AUD_SinusReader.h +++ b/intern/audaspace/intern/AUD_SinusReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SINUSREADER -#define AUD_SINUSREADER +#ifndef __AUD_SINUSREADER_H__ +#define __AUD_SINUSREADER_H__ #include "AUD_IReader.h" #include "AUD_Buffer.h" @@ -75,4 +75,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SINUSREADER +#endif //__AUD_SINUSREADER_H__ diff --git a/intern/audaspace/intern/AUD_SoftwareDevice.h b/intern/audaspace/intern/AUD_SoftwareDevice.h index 010f579c86d..c429508b622 100644 --- a/intern/audaspace/intern/AUD_SoftwareDevice.h +++ b/intern/audaspace/intern/AUD_SoftwareDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SOFTWAREDEVICE -#define AUD_SOFTWAREDEVICE +#ifndef __AUD_SOFTWAREDEVICE_H__ +#define __AUD_SOFTWAREDEVICE_H__ #include "AUD_IDevice.h" #include "AUD_IHandle.h" @@ -342,4 +342,4 @@ public: virtual void setDistanceModel(AUD_DistanceModel model); }; -#endif //AUD_SOFTWAREDEVICE +#endif //__AUD_SOFTWAREDEVICE_H__ diff --git a/intern/audaspace/intern/AUD_Space.h b/intern/audaspace/intern/AUD_Space.h index c018d6e68e7..f42cb1ab018 100644 --- a/intern/audaspace/intern/AUD_Space.h +++ b/intern/audaspace/intern/AUD_Space.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SPACE -#define AUD_SPACE +#ifndef __AUD_SPACE_H__ +#define __AUD_SPACE_H__ /// The size of a format in bytes. #define AUD_FORMAT_SIZE(format) (format & 0x0F) @@ -253,4 +253,4 @@ typedef struct // void* userData; - for the case it is needed someday } AUD_Exception; -#endif //AUD_SPACE +#endif //__AUD_SPACE_H__ diff --git a/intern/audaspace/intern/AUD_StreamBufferFactory.h b/intern/audaspace/intern/AUD_StreamBufferFactory.h index f1f1c0f6a66..99795d95d33 100644 --- a/intern/audaspace/intern/AUD_StreamBufferFactory.h +++ b/intern/audaspace/intern/AUD_StreamBufferFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_STREAMBUFFERFACTORY -#define AUD_STREAMBUFFERFACTORY +#ifndef __AUD_STREAMBUFFERFACTORY_H__ +#define __AUD_STREAMBUFFERFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_Reference.h" @@ -67,4 +67,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_STREAMBUFFERFACTORY +#endif //__AUD_STREAMBUFFERFACTORY_H__ diff --git a/intern/audaspace/jack/AUD_JackDevice.h b/intern/audaspace/jack/AUD_JackDevice.h index 6373d4f9d6d..dc90c5249a2 100644 --- a/intern/audaspace/jack/AUD_JackDevice.h +++ b/intern/audaspace/jack/AUD_JackDevice.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_JACKDEVICE -#define AUD_JACKDEVICE +#ifndef __AUD_JACKDEVICE_H__ +#define __AUD_JACKDEVICE_H__ #include "AUD_SoftwareDevice.h" @@ -205,4 +205,4 @@ public: bool doesPlayback(); }; -#endif //AUD_JACKDEVICE +#endif //__AUD_JACKDEVICE_H__ diff --git a/intern/audaspace/sndfile/AUD_SndFileFactory.h b/intern/audaspace/sndfile/AUD_SndFileFactory.h index bd02a596db3..7039c7a2615 100644 --- a/intern/audaspace/sndfile/AUD_SndFileFactory.h +++ b/intern/audaspace/sndfile/AUD_SndFileFactory.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SNDFILEFACTORY -#define AUD_SNDFILEFACTORY +#ifndef __AUD_SNDFILEFACTORY_H__ +#define __AUD_SNDFILEFACTORY_H__ #include "AUD_IFactory.h" #include "AUD_Reference.h" @@ -73,4 +73,4 @@ public: virtual AUD_Reference<AUD_IReader> createReader(); }; -#endif //AUD_SNDFILEFACTORY +#endif //__AUD_SNDFILEFACTORY_H__ diff --git a/intern/audaspace/sndfile/AUD_SndFileReader.h b/intern/audaspace/sndfile/AUD_SndFileReader.h index b4552a7d0e5..81d8b45120c 100644 --- a/intern/audaspace/sndfile/AUD_SndFileReader.h +++ b/intern/audaspace/sndfile/AUD_SndFileReader.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SNDFILEREADER -#define AUD_SNDFILEREADER +#ifndef __AUD_SNDFILEREADER_H__ +#define __AUD_SNDFILEREADER_H__ #include "AUD_IReader.h" #include "AUD_Reference.h" @@ -125,4 +125,4 @@ public: virtual void read(int& length, bool& eos, sample_t* buffer); }; -#endif //AUD_SNDFILEREADER +#endif //__AUD_SNDFILEREADER_H__ diff --git a/intern/audaspace/sndfile/AUD_SndFileWriter.h b/intern/audaspace/sndfile/AUD_SndFileWriter.h index 9e29fd1a347..0cadbd19a09 100644 --- a/intern/audaspace/sndfile/AUD_SndFileWriter.h +++ b/intern/audaspace/sndfile/AUD_SndFileWriter.h @@ -27,8 +27,8 @@ */ -#ifndef AUD_SNDFILEWRITER -#define AUD_SNDFILEWRITER +#ifndef __AUD_SNDFILEWRITER_H__ +#define __AUD_SNDFILEWRITER_H__ #include "AUD_IWriter.h" @@ -83,4 +83,4 @@ public: virtual void write(unsigned int length, sample_t* buffer); }; -#endif //AUD_SNDFILEWRITER +#endif //__AUD_SNDFILEWRITER_H__ |