diff options
Diffstat (limited to 'intern/audaspace')
61 files changed, 67 insertions, 74 deletions
diff --git a/intern/audaspace/FX/AUD_AccumulatorFactory.cpp b/intern/audaspace/FX/AUD_AccumulatorFactory.cpp index 207c2ee502b..b0996ebf849 100644 --- a/intern/audaspace/FX/AUD_AccumulatorFactory.cpp +++ b/intern/audaspace/FX/AUD_AccumulatorFactory.cpp @@ -59,7 +59,7 @@ AUD_AccumulatorFactory::AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> facto { } -AUD_Reference<AUD_IReader> AUD_AccumulatorFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_AccumulatorFactory::createReader() { return new AUD_CallbackIIRFilterReader(getReader(), 2, 2, m_additive ? accumulatorFilterAdditive : accumulatorFilter); diff --git a/intern/audaspace/FX/AUD_AccumulatorFactory.h b/intern/audaspace/FX/AUD_AccumulatorFactory.h index becd5d9aaee..c147d1226e5 100644 --- a/intern/audaspace/FX/AUD_AccumulatorFactory.h +++ b/intern/audaspace/FX/AUD_AccumulatorFactory.h @@ -57,7 +57,7 @@ public: */ AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory, bool additive = false); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_ACCUMULATORFACTORY diff --git a/intern/audaspace/FX/AUD_ButterworthFactory.cpp b/intern/audaspace/FX/AUD_ButterworthFactory.cpp index 1161a485fb1..2d6e14a5ef1 100644 --- a/intern/audaspace/FX/AUD_ButterworthFactory.cpp +++ b/intern/audaspace/FX/AUD_ButterworthFactory.cpp @@ -48,7 +48,7 @@ AUD_ButterworthFactory::AUD_ButterworthFactory(AUD_Reference<AUD_IFactory> facto { } -AUD_Reference<AUD_IReader> AUD_ButterworthFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_ButterworthFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); diff --git a/intern/audaspace/FX/AUD_ButterworthFactory.h b/intern/audaspace/FX/AUD_ButterworthFactory.h index c211a6df246..be98fd87380 100644 --- a/intern/audaspace/FX/AUD_ButterworthFactory.h +++ b/intern/audaspace/FX/AUD_ButterworthFactory.h @@ -57,7 +57,7 @@ public: */ AUD_ButterworthFactory(AUD_Reference<AUD_IFactory> factory, float frequency); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_BUTTERWORTHFACTORY diff --git a/intern/audaspace/FX/AUD_DelayFactory.cpp b/intern/audaspace/FX/AUD_DelayFactory.cpp index ceecd7a63c9..e452870281d 100644 --- a/intern/audaspace/FX/AUD_DelayFactory.cpp +++ b/intern/audaspace/FX/AUD_DelayFactory.cpp @@ -44,7 +44,7 @@ float AUD_DelayFactory::getDelay() const return m_delay; } -AUD_Reference<AUD_IReader> AUD_DelayFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_DelayFactory::createReader() { return new AUD_DelayReader(getReader(), m_delay); } diff --git a/intern/audaspace/FX/AUD_DelayFactory.h b/intern/audaspace/FX/AUD_DelayFactory.h index 6362bd19a70..5ab7f850d2f 100644 --- a/intern/audaspace/FX/AUD_DelayFactory.h +++ b/intern/audaspace/FX/AUD_DelayFactory.h @@ -62,7 +62,7 @@ public: */ float getDelay() const; - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_DELAYFACTORY diff --git a/intern/audaspace/FX/AUD_DoubleFactory.cpp b/intern/audaspace/FX/AUD_DoubleFactory.cpp index 5b72082f520..e1e6ba50435 100644 --- a/intern/audaspace/FX/AUD_DoubleFactory.cpp +++ b/intern/audaspace/FX/AUD_DoubleFactory.cpp @@ -37,7 +37,7 @@ AUD_DoubleFactory::AUD_DoubleFactory(AUD_Reference<AUD_IFactory> factory1, AUD_R { } -AUD_Reference<AUD_IReader> AUD_DoubleFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_DoubleFactory::createReader() { AUD_Reference<AUD_IReader> reader1 = m_factory1->createReader(); AUD_Reference<AUD_IReader> reader2 = m_factory2->createReader(); diff --git a/intern/audaspace/FX/AUD_DoubleFactory.h b/intern/audaspace/FX/AUD_DoubleFactory.h index acc9997deea..f2be7132442 100644 --- a/intern/audaspace/FX/AUD_DoubleFactory.h +++ b/intern/audaspace/FX/AUD_DoubleFactory.h @@ -63,7 +63,7 @@ public: */ AUD_DoubleFactory(AUD_Reference<AUD_IFactory> factory1, AUD_Reference<AUD_IFactory> factory2); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_DOUBLEFACTORY diff --git a/intern/audaspace/FX/AUD_EnvelopeFactory.cpp b/intern/audaspace/FX/AUD_EnvelopeFactory.cpp index e36091950a5..53378efb053 100644 --- a/intern/audaspace/FX/AUD_EnvelopeFactory.cpp +++ b/intern/audaspace/FX/AUD_EnvelopeFactory.cpp @@ -67,7 +67,7 @@ AUD_EnvelopeFactory::AUD_EnvelopeFactory(AUD_Reference<AUD_IFactory> factory, fl { } -AUD_Reference<AUD_IReader> AUD_EnvelopeFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_EnvelopeFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); diff --git a/intern/audaspace/FX/AUD_EnvelopeFactory.h b/intern/audaspace/FX/AUD_EnvelopeFactory.h index 0a803f77aaf..acf3b13dbc8 100644 --- a/intern/audaspace/FX/AUD_EnvelopeFactory.h +++ b/intern/audaspace/FX/AUD_EnvelopeFactory.h @@ -76,7 +76,7 @@ public: AUD_EnvelopeFactory(AUD_Reference<AUD_IFactory> factory, float attack, float release, float threshold, float arthreshold); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_ENVELOPEFACTORY diff --git a/intern/audaspace/FX/AUD_FaderFactory.cpp b/intern/audaspace/FX/AUD_FaderFactory.cpp index e7fe5098d76..635873e0ee5 100644 --- a/intern/audaspace/FX/AUD_FaderFactory.cpp +++ b/intern/audaspace/FX/AUD_FaderFactory.cpp @@ -56,7 +56,7 @@ float AUD_FaderFactory::getLength() const return m_length; } -AUD_Reference<AUD_IReader> AUD_FaderFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_FaderFactory::createReader() { return new AUD_FaderReader(getReader(), m_type, m_start, m_length); } diff --git a/intern/audaspace/FX/AUD_FaderFactory.h b/intern/audaspace/FX/AUD_FaderFactory.h index cc20245a267..d8314c77ed4 100644 --- a/intern/audaspace/FX/AUD_FaderFactory.h +++ b/intern/audaspace/FX/AUD_FaderFactory.h @@ -88,7 +88,7 @@ public: */ float getLength() const; - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_FADERFACTORY diff --git a/intern/audaspace/FX/AUD_HighpassFactory.cpp b/intern/audaspace/FX/AUD_HighpassFactory.cpp index b8bfa6545ac..2104158cdf5 100644 --- a/intern/audaspace/FX/AUD_HighpassFactory.cpp +++ b/intern/audaspace/FX/AUD_HighpassFactory.cpp @@ -46,7 +46,7 @@ AUD_HighpassFactory::AUD_HighpassFactory(AUD_Reference<AUD_IFactory> factory, fl { } -AUD_Reference<AUD_IReader> AUD_HighpassFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_HighpassFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); diff --git a/intern/audaspace/FX/AUD_HighpassFactory.h b/intern/audaspace/FX/AUD_HighpassFactory.h index 0089cc2c139..de646e7dd64 100644 --- a/intern/audaspace/FX/AUD_HighpassFactory.h +++ b/intern/audaspace/FX/AUD_HighpassFactory.h @@ -63,7 +63,7 @@ public: */ AUD_HighpassFactory(AUD_Reference<AUD_IFactory> factory, float frequency, float Q = 1.0f); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_HIGHPASSFACTORY diff --git a/intern/audaspace/FX/AUD_IIRFilterFactory.cpp b/intern/audaspace/FX/AUD_IIRFilterFactory.cpp index e24a10266c9..f6ccda6f67e 100644 --- a/intern/audaspace/FX/AUD_IIRFilterFactory.cpp +++ b/intern/audaspace/FX/AUD_IIRFilterFactory.cpp @@ -39,7 +39,7 @@ AUD_IIRFilterFactory::AUD_IIRFilterFactory(AUD_Reference<AUD_IFactory> factory, { } -AUD_Reference<AUD_IReader> AUD_IIRFilterFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_IIRFilterFactory::createReader() { return new AUD_IIRFilterReader(getReader(), m_b, m_a); } diff --git a/intern/audaspace/FX/AUD_IIRFilterFactory.h b/intern/audaspace/FX/AUD_IIRFilterFactory.h index ffcc70a8ecb..0e92ab1a568 100644 --- a/intern/audaspace/FX/AUD_IIRFilterFactory.h +++ b/intern/audaspace/FX/AUD_IIRFilterFactory.h @@ -66,7 +66,7 @@ public: AUD_IIRFilterFactory(AUD_Reference<AUD_IFactory> factory, std::vector<float> b, std::vector<float> a); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_IIRFILTERFACTORY diff --git a/intern/audaspace/FX/AUD_LimiterFactory.cpp b/intern/audaspace/FX/AUD_LimiterFactory.cpp index e52cdd75d4d..8d1dd14f3ae 100644 --- a/intern/audaspace/FX/AUD_LimiterFactory.cpp +++ b/intern/audaspace/FX/AUD_LimiterFactory.cpp @@ -51,7 +51,7 @@ float AUD_LimiterFactory::getEnd() const return m_end; } -AUD_Reference<AUD_IReader> AUD_LimiterFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_LimiterFactory::createReader() { return new AUD_LimiterReader(getReader(), m_start, m_end); } diff --git a/intern/audaspace/FX/AUD_LimiterFactory.h b/intern/audaspace/FX/AUD_LimiterFactory.h index c45b9da65fe..c04bfe861b2 100644 --- a/intern/audaspace/FX/AUD_LimiterFactory.h +++ b/intern/audaspace/FX/AUD_LimiterFactory.h @@ -75,7 +75,7 @@ public: */ float getEnd() const; - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_LIMITERFACTORY diff --git a/intern/audaspace/FX/AUD_LoopFactory.cpp b/intern/audaspace/FX/AUD_LoopFactory.cpp index 021e69901b2..fd39ac901c1 100644 --- a/intern/audaspace/FX/AUD_LoopFactory.cpp +++ b/intern/audaspace/FX/AUD_LoopFactory.cpp @@ -43,7 +43,7 @@ int AUD_LoopFactory::getLoop() const return m_loop; } -AUD_Reference<AUD_IReader> AUD_LoopFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_LoopFactory::createReader() { return new AUD_LoopReader(getReader(), m_loop); } diff --git a/intern/audaspace/FX/AUD_LoopFactory.h b/intern/audaspace/FX/AUD_LoopFactory.h index 4d601d5a605..03c00dc40ce 100644 --- a/intern/audaspace/FX/AUD_LoopFactory.h +++ b/intern/audaspace/FX/AUD_LoopFactory.h @@ -64,7 +64,7 @@ public: */ int getLoop() const; - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_LOOPFACTORY diff --git a/intern/audaspace/FX/AUD_LowpassFactory.cpp b/intern/audaspace/FX/AUD_LowpassFactory.cpp index d0f33c120d9..9bc8d7cfe21 100644 --- a/intern/audaspace/FX/AUD_LowpassFactory.cpp +++ b/intern/audaspace/FX/AUD_LowpassFactory.cpp @@ -46,7 +46,7 @@ AUD_LowpassFactory::AUD_LowpassFactory(AUD_Reference<AUD_IFactory> factory, floa { } -AUD_Reference<AUD_IReader> AUD_LowpassFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_LowpassFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); diff --git a/intern/audaspace/FX/AUD_LowpassFactory.h b/intern/audaspace/FX/AUD_LowpassFactory.h index efe4dafc4e1..43d47dc9065 100644 --- a/intern/audaspace/FX/AUD_LowpassFactory.h +++ b/intern/audaspace/FX/AUD_LowpassFactory.h @@ -63,7 +63,7 @@ public: */ AUD_LowpassFactory(AUD_Reference<AUD_IFactory> factory, float frequency, float Q = 1.0f); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_LOWPASSFACTORY diff --git a/intern/audaspace/FX/AUD_PingPongFactory.cpp b/intern/audaspace/FX/AUD_PingPongFactory.cpp index 4f0d2a207ac..e5f2193ea56 100644 --- a/intern/audaspace/FX/AUD_PingPongFactory.cpp +++ b/intern/audaspace/FX/AUD_PingPongFactory.cpp @@ -38,7 +38,7 @@ AUD_PingPongFactory::AUD_PingPongFactory(AUD_Reference<AUD_IFactory> factory) : { } -AUD_Reference<AUD_IReader> AUD_PingPongFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_PingPongFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); AUD_ReverseFactory factory(m_factory); diff --git a/intern/audaspace/FX/AUD_PingPongFactory.h b/intern/audaspace/FX/AUD_PingPongFactory.h index 1c88a5a7114..908591a6ebe 100644 --- a/intern/audaspace/FX/AUD_PingPongFactory.h +++ b/intern/audaspace/FX/AUD_PingPongFactory.h @@ -52,7 +52,7 @@ public: */ AUD_PingPongFactory(AUD_Reference<AUD_IFactory> factory); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_PINGPONGFACTORY diff --git a/intern/audaspace/FX/AUD_PitchFactory.cpp b/intern/audaspace/FX/AUD_PitchFactory.cpp index 94a3fb8034e..e52028754e9 100644 --- a/intern/audaspace/FX/AUD_PitchFactory.cpp +++ b/intern/audaspace/FX/AUD_PitchFactory.cpp @@ -39,7 +39,7 @@ AUD_PitchFactory::AUD_PitchFactory(AUD_Reference<AUD_IFactory> factory, float pi { } -AUD_Reference<AUD_IReader> AUD_PitchFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_PitchFactory::createReader() { return new AUD_PitchReader(getReader(), m_pitch); } diff --git a/intern/audaspace/FX/AUD_PitchFactory.h b/intern/audaspace/FX/AUD_PitchFactory.h index bbf08ef5993..2642d41af89 100644 --- a/intern/audaspace/FX/AUD_PitchFactory.h +++ b/intern/audaspace/FX/AUD_PitchFactory.h @@ -57,7 +57,7 @@ public: */ AUD_PitchFactory(AUD_Reference<AUD_IFactory> factory, float pitch); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_PITCHFACTORY diff --git a/intern/audaspace/FX/AUD_RectifyFactory.cpp b/intern/audaspace/FX/AUD_RectifyFactory.cpp index 3bacd033eb3..1e500dae3cc 100644 --- a/intern/audaspace/FX/AUD_RectifyFactory.cpp +++ b/intern/audaspace/FX/AUD_RectifyFactory.cpp @@ -44,7 +44,7 @@ AUD_RectifyFactory::AUD_RectifyFactory(AUD_Reference<AUD_IFactory> factory) : { } -AUD_Reference<AUD_IReader> AUD_RectifyFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_RectifyFactory::createReader() { return new AUD_CallbackIIRFilterReader(getReader(), 1, 1, rectifyFilter); } diff --git a/intern/audaspace/FX/AUD_RectifyFactory.h b/intern/audaspace/FX/AUD_RectifyFactory.h index d8411186001..d7dc236c5fc 100644 --- a/intern/audaspace/FX/AUD_RectifyFactory.h +++ b/intern/audaspace/FX/AUD_RectifyFactory.h @@ -51,7 +51,7 @@ public: */ AUD_RectifyFactory(AUD_Reference<AUD_IFactory> factory); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_RECTIFYFACTORY diff --git a/intern/audaspace/FX/AUD_ReverseFactory.cpp b/intern/audaspace/FX/AUD_ReverseFactory.cpp index 88d812d7f2a..060a618dd68 100644 --- a/intern/audaspace/FX/AUD_ReverseFactory.cpp +++ b/intern/audaspace/FX/AUD_ReverseFactory.cpp @@ -38,7 +38,7 @@ AUD_ReverseFactory::AUD_ReverseFactory(AUD_Reference<AUD_IFactory> factory) : { } -AUD_Reference<AUD_IReader> AUD_ReverseFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_ReverseFactory::createReader() { return new AUD_ReverseReader(getReader()); } diff --git a/intern/audaspace/FX/AUD_ReverseFactory.h b/intern/audaspace/FX/AUD_ReverseFactory.h index ae1fdd5a233..b501b4e76c8 100644 --- a/intern/audaspace/FX/AUD_ReverseFactory.h +++ b/intern/audaspace/FX/AUD_ReverseFactory.h @@ -52,7 +52,7 @@ public: */ AUD_ReverseFactory(AUD_Reference<AUD_IFactory> factory); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_REVERSEFACTORY diff --git a/intern/audaspace/FX/AUD_SquareFactory.cpp b/intern/audaspace/FX/AUD_SquareFactory.cpp index a3ea088a258..3e94107ff8a 100644 --- a/intern/audaspace/FX/AUD_SquareFactory.cpp +++ b/intern/audaspace/FX/AUD_SquareFactory.cpp @@ -59,7 +59,7 @@ float AUD_SquareFactory::getThreshold() const return m_threshold; } -AUD_Reference<AUD_IReader> AUD_SquareFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_SquareFactory::createReader() { return new AUD_CallbackIIRFilterReader(getReader(), 1, 1, (doFilterIIR) squareFilter, diff --git a/intern/audaspace/FX/AUD_SquareFactory.h b/intern/audaspace/FX/AUD_SquareFactory.h index 60db49c48e5..31f22614e0a 100644 --- a/intern/audaspace/FX/AUD_SquareFactory.h +++ b/intern/audaspace/FX/AUD_SquareFactory.h @@ -62,7 +62,7 @@ public: */ float getThreshold() const; - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_SQUAREFACTORY diff --git a/intern/audaspace/FX/AUD_SumFactory.cpp b/intern/audaspace/FX/AUD_SumFactory.cpp index 582e2d75b7f..befcc30360f 100644 --- a/intern/audaspace/FX/AUD_SumFactory.cpp +++ b/intern/audaspace/FX/AUD_SumFactory.cpp @@ -37,7 +37,7 @@ AUD_SumFactory::AUD_SumFactory(AUD_Reference<AUD_IFactory> factory) : { } -AUD_Reference<AUD_IReader> AUD_SumFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_SumFactory::createReader() { std::vector<float> a, b; a.push_back(1); diff --git a/intern/audaspace/FX/AUD_SumFactory.h b/intern/audaspace/FX/AUD_SumFactory.h index 948355e50fd..cdb4caf6e49 100644 --- a/intern/audaspace/FX/AUD_SumFactory.h +++ b/intern/audaspace/FX/AUD_SumFactory.h @@ -51,7 +51,7 @@ public: */ AUD_SumFactory(AUD_Reference<AUD_IFactory> factory); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_SUMFACTORY diff --git a/intern/audaspace/FX/AUD_SuperposeFactory.cpp b/intern/audaspace/FX/AUD_SuperposeFactory.cpp index b5e816f66a8..d514bfd8fca 100644 --- a/intern/audaspace/FX/AUD_SuperposeFactory.cpp +++ b/intern/audaspace/FX/AUD_SuperposeFactory.cpp @@ -37,7 +37,7 @@ AUD_SuperposeFactory::AUD_SuperposeFactory(AUD_Reference<AUD_IFactory> factory1, { } -AUD_Reference<AUD_IReader> AUD_SuperposeFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_SuperposeFactory::createReader() { AUD_Reference<AUD_IReader> reader1 = m_factory1->createReader(); AUD_Reference<AUD_IReader> reader2 = m_factory2->createReader(); diff --git a/intern/audaspace/FX/AUD_SuperposeFactory.h b/intern/audaspace/FX/AUD_SuperposeFactory.h index d302658097e..ac7ec080134 100644 --- a/intern/audaspace/FX/AUD_SuperposeFactory.h +++ b/intern/audaspace/FX/AUD_SuperposeFactory.h @@ -63,7 +63,7 @@ public: */ AUD_SuperposeFactory(AUD_Reference<AUD_IFactory> factory1, AUD_Reference<AUD_IFactory> factory2); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_SUPERPOSEFACTORY diff --git a/intern/audaspace/FX/AUD_VolumeFactory.cpp b/intern/audaspace/FX/AUD_VolumeFactory.cpp index 1249c4ab9bd..17cefd4f3c3 100644 --- a/intern/audaspace/FX/AUD_VolumeFactory.cpp +++ b/intern/audaspace/FX/AUD_VolumeFactory.cpp @@ -43,7 +43,7 @@ float AUD_VolumeFactory::getVolume() const return m_volume; } -AUD_Reference<AUD_IReader> AUD_VolumeFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_VolumeFactory::createReader() { std::vector<float> a, b; a.push_back(1); diff --git a/intern/audaspace/FX/AUD_VolumeFactory.h b/intern/audaspace/FX/AUD_VolumeFactory.h index 3cb8bc1da17..bcc08e7d04a 100644 --- a/intern/audaspace/FX/AUD_VolumeFactory.h +++ b/intern/audaspace/FX/AUD_VolumeFactory.h @@ -64,7 +64,7 @@ public: */ float getVolume() const; - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_VOLUMEFACTORY diff --git a/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp b/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp index ca9c71e73b8..15e96f6ff1d 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp +++ b/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp @@ -38,7 +38,7 @@ AUD_SRCResampleFactory::AUD_SRCResampleFactory(AUD_Reference<AUD_IFactory> facto { } -AUD_Reference<AUD_IReader> AUD_SRCResampleFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_SRCResampleFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); diff --git a/intern/audaspace/SRC/AUD_SRCResampleFactory.h b/intern/audaspace/SRC/AUD_SRCResampleFactory.h index 5d21584b4dc..d3e7acf0d95 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleFactory.h +++ b/intern/audaspace/SRC/AUD_SRCResampleFactory.h @@ -48,7 +48,7 @@ private: public: AUD_SRCResampleFactory(AUD_Reference<AUD_IFactory> factory, AUD_DeviceSpecs specs); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_SRCRESAMPLEFACTORY diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp index 4e1eedd29ee..909f41302d7 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp @@ -49,7 +49,7 @@ AUD_FFMPEGFactory::AUD_FFMPEGFactory(const data_t* buffer, int size) : memcpy(m_buffer->getBuffer(), buffer, size); } -AUD_Reference<AUD_IReader> AUD_FFMPEGFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_FFMPEGFactory::createReader() { if(m_buffer.isNull()) return new AUD_FFMPEGReader(m_filename); diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h index 8033836e80b..af95e3a3b81 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h @@ -74,7 +74,7 @@ public: */ AUD_FFMPEGFactory(const data_t* buffer, int size); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_FFMPEGFACTORY diff --git a/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp b/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp index ea5e9519729..d8ed1153dae 100644 --- a/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp +++ b/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp @@ -102,7 +102,7 @@ void AUD_ChannelMapperFactory::deleteMapping(int ic) } } -AUD_Reference<AUD_IReader> AUD_ChannelMapperFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_ChannelMapperFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); int ic = reader->getSpecs().channels; diff --git a/intern/audaspace/intern/AUD_ChannelMapperFactory.h b/intern/audaspace/intern/AUD_ChannelMapperFactory.h index 25b3e091d8d..7c48aa791a6 100644 --- a/intern/audaspace/intern/AUD_ChannelMapperFactory.h +++ b/intern/audaspace/intern/AUD_ChannelMapperFactory.h @@ -67,7 +67,7 @@ public: */ void deleteMapping(int ic); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_CHANNELMAPPERFACTORY diff --git a/intern/audaspace/intern/AUD_ConverterFactory.cpp b/intern/audaspace/intern/AUD_ConverterFactory.cpp index 78602d2cfa9..bf9a3586616 100644 --- a/intern/audaspace/intern/AUD_ConverterFactory.cpp +++ b/intern/audaspace/intern/AUD_ConverterFactory.cpp @@ -38,7 +38,7 @@ AUD_ConverterFactory::AUD_ConverterFactory(AUD_Reference<AUD_IFactory> factory, { } -AUD_Reference<AUD_IReader> AUD_ConverterFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_ConverterFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); diff --git a/intern/audaspace/intern/AUD_ConverterFactory.h b/intern/audaspace/intern/AUD_ConverterFactory.h index cc1fedb2a10..8f0221addb7 100644 --- a/intern/audaspace/intern/AUD_ConverterFactory.h +++ b/intern/audaspace/intern/AUD_ConverterFactory.h @@ -48,7 +48,7 @@ private: public: AUD_ConverterFactory(AUD_Reference<AUD_IFactory> factory, AUD_DeviceSpecs specs); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_CONVERTERFACTORY diff --git a/intern/audaspace/intern/AUD_FileFactory.cpp b/intern/audaspace/intern/AUD_FileFactory.cpp index 2f02d4a55e1..684fbb13fb2 100644 --- a/intern/audaspace/intern/AUD_FileFactory.cpp +++ b/intern/audaspace/intern/AUD_FileFactory.cpp @@ -59,7 +59,7 @@ AUD_FileFactory::AUD_FileFactory(const data_t* buffer, int size) : static const char* read_error = "AUD_FileFactory: File couldn't be read."; -AUD_Reference<AUD_IReader> AUD_FileFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_FileFactory::createReader() { #ifdef WITH_SNDFILE try diff --git a/intern/audaspace/intern/AUD_FileFactory.h b/intern/audaspace/intern/AUD_FileFactory.h index c63e50b3b0d..dfca70bc3fd 100644 --- a/intern/audaspace/intern/AUD_FileFactory.h +++ b/intern/audaspace/intern/AUD_FileFactory.h @@ -72,7 +72,7 @@ public: */ AUD_FileFactory(const data_t* buffer, int size); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_FILEFACTORY diff --git a/intern/audaspace/intern/AUD_IFactory.h b/intern/audaspace/intern/AUD_IFactory.h index 48f2802f871..c1a9de7f724 100644 --- a/intern/audaspace/intern/AUD_IFactory.h +++ b/intern/audaspace/intern/AUD_IFactory.h @@ -56,7 +56,7 @@ public: * \exception AUD_Exception An exception may be thrown if there has been * a more unexpected error during reader creation. */ - virtual AUD_Reference<AUD_IReader> createReader() const=0; + virtual AUD_Reference<AUD_IReader> createReader()=0; }; #endif //AUD_IFACTORY diff --git a/intern/audaspace/intern/AUD_LinearResampleFactory.cpp b/intern/audaspace/intern/AUD_LinearResampleFactory.cpp index f7ac9e1e83e..404281a33bb 100644 --- a/intern/audaspace/intern/AUD_LinearResampleFactory.cpp +++ b/intern/audaspace/intern/AUD_LinearResampleFactory.cpp @@ -38,7 +38,7 @@ AUD_LinearResampleFactory::AUD_LinearResampleFactory(AUD_Reference<AUD_IFactory> { } -AUD_Reference<AUD_IReader> AUD_LinearResampleFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_LinearResampleFactory::createReader() { AUD_Reference<AUD_IReader> reader = getReader(); diff --git a/intern/audaspace/intern/AUD_LinearResampleFactory.h b/intern/audaspace/intern/AUD_LinearResampleFactory.h index 6a593b11f28..9f4e9e10aba 100644 --- a/intern/audaspace/intern/AUD_LinearResampleFactory.h +++ b/intern/audaspace/intern/AUD_LinearResampleFactory.h @@ -47,7 +47,7 @@ private: public: AUD_LinearResampleFactory(AUD_Reference<AUD_IFactory> factory, AUD_DeviceSpecs specs); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_LINEARRESAMPLEFACTORY diff --git a/intern/audaspace/intern/AUD_SequencerFactory.cpp b/intern/audaspace/intern/AUD_SequencerFactory.cpp index ee0af900b04..47d5243c04e 100644 --- a/intern/audaspace/intern/AUD_SequencerFactory.cpp +++ b/intern/audaspace/intern/AUD_SequencerFactory.cpp @@ -63,16 +63,6 @@ bool AUD_SequencerFactory::getMute() const return m_muted; } -AUD_Reference<AUD_IReader> AUD_SequencerFactory::newReader() -{ - AUD_Reference<AUD_SequencerReader> reader = new AUD_SequencerReader(*m_this, m_entries, - m_specs, m_data, - m_volume); - m_readers.push_front(reader); - - return reader.convert<AUD_IReader>(); -} - AUD_Reference<AUD_SequencerEntry> AUD_SequencerFactory::add(AUD_Reference<AUD_IFactory>** sound, float begin, float end, float skip, void* data) { AUD_Reference<AUD_SequencerEntry> entry = new AUD_SequencerEntry; @@ -111,9 +101,14 @@ void AUD_SequencerFactory::mute(AUD_Reference<AUD_SequencerEntry> entry, bool mu entry->muted = mute; } -AUD_Reference<AUD_IReader> AUD_SequencerFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_SequencerFactory::createReader() { - return const_cast<AUD_SequencerFactory*>(this)->newReader(); + AUD_Reference<AUD_SequencerReader> reader = new AUD_SequencerReader(*m_this, m_entries, + m_specs, m_data, + m_volume); + m_readers.push_front(reader); + + return reader.convert<AUD_IReader>(); } void AUD_SequencerFactory::removeReader(AUD_Reference<AUD_SequencerReader> reader) diff --git a/intern/audaspace/intern/AUD_SequencerFactory.h b/intern/audaspace/intern/AUD_SequencerFactory.h index b0393297622..37a332bc9ff 100644 --- a/intern/audaspace/intern/AUD_SequencerFactory.h +++ b/intern/audaspace/intern/AUD_SequencerFactory.h @@ -68,8 +68,6 @@ private: AUD_volumeFunction m_volume; AUD_Reference<AUD_SequencerFactory>* m_this; - AUD_Reference<AUD_IReader> newReader(); - // hide copy constructor and operator= AUD_SequencerFactory(const AUD_SequencerFactory&); AUD_SequencerFactory& operator=(const AUD_SequencerFactory&); @@ -87,7 +85,7 @@ public: void move(AUD_Reference<AUD_SequencerEntry> entry, float begin, float end, float skip); void mute(AUD_Reference<AUD_SequencerEntry> entry, bool mute); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); void removeReader(AUD_Reference<AUD_SequencerReader> reader); }; diff --git a/intern/audaspace/intern/AUD_SilenceFactory.cpp b/intern/audaspace/intern/AUD_SilenceFactory.cpp index f1eae1889a2..aefd561a584 100644 --- a/intern/audaspace/intern/AUD_SilenceFactory.cpp +++ b/intern/audaspace/intern/AUD_SilenceFactory.cpp @@ -37,7 +37,7 @@ AUD_SilenceFactory::AUD_SilenceFactory() { } -AUD_Reference<AUD_IReader> AUD_SilenceFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_SilenceFactory::createReader() { return new AUD_SilenceReader(); } diff --git a/intern/audaspace/intern/AUD_SilenceFactory.h b/intern/audaspace/intern/AUD_SilenceFactory.h index 0920c1267ab..69b446408d7 100644 --- a/intern/audaspace/intern/AUD_SilenceFactory.h +++ b/intern/audaspace/intern/AUD_SilenceFactory.h @@ -50,7 +50,7 @@ public: */ AUD_SilenceFactory(); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_SILENCEFACTORY diff --git a/intern/audaspace/intern/AUD_SinusFactory.cpp b/intern/audaspace/intern/AUD_SinusFactory.cpp index 8276856b9e2..b79f6bee6d7 100644 --- a/intern/audaspace/intern/AUD_SinusFactory.cpp +++ b/intern/audaspace/intern/AUD_SinusFactory.cpp @@ -44,7 +44,7 @@ float AUD_SinusFactory::getFrequency() const return m_frequency; } -AUD_Reference<AUD_IReader> AUD_SinusFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_SinusFactory::createReader() { return new AUD_SinusReader(m_frequency, m_sampleRate); } diff --git a/intern/audaspace/intern/AUD_SinusFactory.h b/intern/audaspace/intern/AUD_SinusFactory.h index a440d7b7535..a6bc7f2110c 100644 --- a/intern/audaspace/intern/AUD_SinusFactory.h +++ b/intern/audaspace/intern/AUD_SinusFactory.h @@ -68,7 +68,7 @@ public: */ float getFrequency() const; - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_SINUSFACTORY diff --git a/intern/audaspace/intern/AUD_StreamBufferFactory.cpp b/intern/audaspace/intern/AUD_StreamBufferFactory.cpp index 1b96c97742b..64e22637329 100644 --- a/intern/audaspace/intern/AUD_StreamBufferFactory.cpp +++ b/intern/audaspace/intern/AUD_StreamBufferFactory.cpp @@ -70,7 +70,7 @@ AUD_StreamBufferFactory::AUD_StreamBufferFactory(AUD_Reference<AUD_IFactory> fac m_buffer->resize(index * sample_size, true); } -AUD_Reference<AUD_IReader> AUD_StreamBufferFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_StreamBufferFactory::createReader() { return new AUD_BufferReader(m_buffer, m_specs); } diff --git a/intern/audaspace/intern/AUD_StreamBufferFactory.h b/intern/audaspace/intern/AUD_StreamBufferFactory.h index fc5f103d99b..2783889ff6c 100644 --- a/intern/audaspace/intern/AUD_StreamBufferFactory.h +++ b/intern/audaspace/intern/AUD_StreamBufferFactory.h @@ -66,7 +66,7 @@ public: */ AUD_StreamBufferFactory(AUD_Reference<AUD_IFactory> factory); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_STREAMBUFFERFACTORY diff --git a/intern/audaspace/sndfile/AUD_SndFileFactory.cpp b/intern/audaspace/sndfile/AUD_SndFileFactory.cpp index 7ab3308f01b..5a0280cdf84 100644 --- a/intern/audaspace/sndfile/AUD_SndFileFactory.cpp +++ b/intern/audaspace/sndfile/AUD_SndFileFactory.cpp @@ -46,7 +46,7 @@ AUD_SndFileFactory::AUD_SndFileFactory(const data_t* buffer, int size) : memcpy(m_buffer->getBuffer(), buffer, size); } -AUD_Reference<AUD_IReader> AUD_SndFileFactory::createReader() const +AUD_Reference<AUD_IReader> AUD_SndFileFactory::createReader() { if(m_buffer.isNull()) return new AUD_SndFileReader(m_filename); diff --git a/intern/audaspace/sndfile/AUD_SndFileFactory.h b/intern/audaspace/sndfile/AUD_SndFileFactory.h index 3a1037e5587..a46dc165264 100644 --- a/intern/audaspace/sndfile/AUD_SndFileFactory.h +++ b/intern/audaspace/sndfile/AUD_SndFileFactory.h @@ -72,7 +72,7 @@ public: */ AUD_SndFileFactory(const data_t* buffer, int size); - virtual AUD_Reference<AUD_IReader> createReader() const; + virtual AUD_Reference<AUD_IReader> createReader(); }; #endif //AUD_SNDFILEFACTORY |