Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

3D Audio GSoC:

Browse Source 
Removing unneeded const from Factory::createReader.
This commit is contained in:
Joerg Mueller
2011-06-14 21:22:22 +00:00
parent f3f3bcc45e
commit f8212f4e03
61 changed files with 67 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/audaspace/FX/AUD_AccumulatorFactory.cpp
View File

@@ -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, return new AUD_CallbackIIRFilterReader(getReader(), 2, 2,
m_additive ? accumulatorFilterAdditive : accumulatorFilter); m_additive ? accumulatorFilterAdditive : accumulatorFilter);

2
intern/audaspace/FX/AUD_AccumulatorFactory.h
View File

@@ -57,7 +57,7 @@ public:
*/ */
AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory, bool additive = false); 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 #endif //AUD_ACCUMULATORFACTORY

2
intern/audaspace/FX/AUD_ButterworthFactory.cpp
View File

@@ -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(); AUD_Reference<AUD_IReader> reader = getReader();

2
intern/audaspace/FX/AUD_ButterworthFactory.h
View File

@@ -57,7 +57,7 @@ public:
*/ */
AUD_ButterworthFactory(AUD_Reference<AUD_IFactory> factory, float frequency); 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 #endif //AUD_BUTTERWORTHFACTORY

2
intern/audaspace/FX/AUD_DelayFactory.cpp
View File

@@ -44,7 +44,7 @@ float AUD_DelayFactory::getDelay() const
return m_delay; 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); return new AUD_DelayReader(getReader(), m_delay);
} }

2
intern/audaspace/FX/AUD_DelayFactory.h
View File

@@ -62,7 +62,7 @@ public:
*/ */
float getDelay() const; float getDelay() const;
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_DELAYFACTORY #endif //AUD_DELAYFACTORY

2
intern/audaspace/FX/AUD_DoubleFactory.cpp
View File

@@ -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> reader1 = m_factory1->createReader();
AUD_Reference<AUD_IReader> reader2 = m_factory2->createReader(); AUD_Reference<AUD_IReader> reader2 = m_factory2->createReader();

2
intern/audaspace/FX/AUD_DoubleFactory.h
View File

@@ -63,7 +63,7 @@ public:
*/ */
AUD_DoubleFactory(AUD_Reference<AUD_IFactory> factory1, AUD_Reference<AUD_IFactory> factory2); 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 #endif //AUD_DOUBLEFACTORY

2
intern/audaspace/FX/AUD_EnvelopeFactory.cpp
View File

@@ -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(); AUD_Reference<AUD_IReader> reader = getReader();

2
intern/audaspace/FX/AUD_EnvelopeFactory.h
View File

@@ -76,7 +76,7 @@ public:
AUD_EnvelopeFactory(AUD_Reference<AUD_IFactory> factory, float attack, float release, AUD_EnvelopeFactory(AUD_Reference<AUD_IFactory> factory, float attack, float release,
float threshold, float arthreshold); float threshold, float arthreshold);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_ENVELOPEFACTORY #endif //AUD_ENVELOPEFACTORY

2
intern/audaspace/FX/AUD_FaderFactory.cpp
View File

@@ -56,7 +56,7 @@ float AUD_FaderFactory::getLength() const
return m_length; 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); return new AUD_FaderReader(getReader(), m_type, m_start, m_length);
} }

2
intern/audaspace/FX/AUD_FaderFactory.h
View File

@@ -88,7 +88,7 @@ public:
*/ */
float getLength() const; float getLength() const;
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_FADERFACTORY #endif //AUD_FADERFACTORY

2
intern/audaspace/FX/AUD_HighpassFactory.cpp
View File

@@ -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(); AUD_Reference<AUD_IReader> reader = getReader();

2
intern/audaspace/FX/AUD_HighpassFactory.h
View File

@@ -63,7 +63,7 @@ public:
*/ */
AUD_HighpassFactory(AUD_Reference<AUD_IFactory> factory, float frequency, float Q = 1.0f); 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 #endif //AUD_HIGHPASSFACTORY

2
intern/audaspace/FX/AUD_IIRFilterFactory.cpp
View File

@@ -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); return new AUD_IIRFilterReader(getReader(), m_b, m_a);
} }

2
intern/audaspace/FX/AUD_IIRFilterFactory.h
View File

@@ -66,7 +66,7 @@ public:
AUD_IIRFilterFactory(AUD_Reference<AUD_IFactory> factory, std::vector<float> b, AUD_IIRFilterFactory(AUD_Reference<AUD_IFactory> factory, std::vector<float> b,
std::vector<float> a); std::vector<float> a);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_IIRFILTERFACTORY #endif //AUD_IIRFILTERFACTORY

2
intern/audaspace/FX/AUD_LimiterFactory.cpp
View File

@@ -51,7 +51,7 @@ float AUD_LimiterFactory::getEnd() const
return m_end; 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); return new AUD_LimiterReader(getReader(), m_start, m_end);
} }

2
intern/audaspace/FX/AUD_LimiterFactory.h
View File

@@ -75,7 +75,7 @@ public:
*/ */
float getEnd() const; float getEnd() const;
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_LIMITERFACTORY #endif //AUD_LIMITERFACTORY

2
intern/audaspace/FX/AUD_LoopFactory.cpp
View File

@@ -43,7 +43,7 @@ int AUD_LoopFactory::getLoop() const
return m_loop; 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); return new AUD_LoopReader(getReader(), m_loop);
} }

2
intern/audaspace/FX/AUD_LoopFactory.h
View File

@@ -64,7 +64,7 @@ public:
*/ */
int getLoop() const; int getLoop() const;
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_LOOPFACTORY #endif //AUD_LOOPFACTORY

2
intern/audaspace/FX/AUD_LowpassFactory.cpp
View File

@@ -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(); AUD_Reference<AUD_IReader> reader = getReader();

2
intern/audaspace/FX/AUD_LowpassFactory.h
View File

@@ -63,7 +63,7 @@ public:
*/ */
AUD_LowpassFactory(AUD_Reference<AUD_IFactory> factory, float frequency, float Q = 1.0f); 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 #endif //AUD_LOWPASSFACTORY

2
intern/audaspace/FX/AUD_PingPongFactory.cpp
View File

@@ -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_Reference<AUD_IReader> reader = getReader();
AUD_ReverseFactory factory(m_factory); AUD_ReverseFactory factory(m_factory);

2
intern/audaspace/FX/AUD_PingPongFactory.h
View File

@@ -52,7 +52,7 @@ public:
*/ */
AUD_PingPongFactory(AUD_Reference<AUD_IFactory> factory); AUD_PingPongFactory(AUD_Reference<AUD_IFactory> factory);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_PINGPONGFACTORY #endif //AUD_PINGPONGFACTORY

2
intern/audaspace/FX/AUD_PitchFactory.cpp
View File

@@ -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); return new AUD_PitchReader(getReader(), m_pitch);
} }

2
intern/audaspace/FX/AUD_PitchFactory.h
View File

@@ -57,7 +57,7 @@ public:
*/ */
AUD_PitchFactory(AUD_Reference<AUD_IFactory> factory, float pitch); 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 #endif //AUD_PITCHFACTORY

2
intern/audaspace/FX/AUD_RectifyFactory.cpp
View File

@@ -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); return new AUD_CallbackIIRFilterReader(getReader(), 1, 1, rectifyFilter);
} }

2
intern/audaspace/FX/AUD_RectifyFactory.h
View File

@@ -51,7 +51,7 @@ public:
*/ */
AUD_RectifyFactory(AUD_Reference<AUD_IFactory> factory); AUD_RectifyFactory(AUD_Reference<AUD_IFactory> factory);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_RECTIFYFACTORY #endif //AUD_RECTIFYFACTORY

2
intern/audaspace/FX/AUD_ReverseFactory.cpp
View File

@@ -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()); return new AUD_ReverseReader(getReader());
} }

2
intern/audaspace/FX/AUD_ReverseFactory.h
View File

@@ -52,7 +52,7 @@ public:
*/ */
AUD_ReverseFactory(AUD_Reference<AUD_IFactory> factory); AUD_ReverseFactory(AUD_Reference<AUD_IFactory> factory);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_REVERSEFACTORY #endif //AUD_REVERSEFACTORY

2
intern/audaspace/FX/AUD_SquareFactory.cpp
View File

@@ -59,7 +59,7 @@ float AUD_SquareFactory::getThreshold() const
return m_threshold; 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, return new AUD_CallbackIIRFilterReader(getReader(), 1, 1,
(doFilterIIR) squareFilter, (doFilterIIR) squareFilter,

2
intern/audaspace/FX/AUD_SquareFactory.h
View File

@@ -62,7 +62,7 @@ public:
*/ */
float getThreshold() const; float getThreshold() const;
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_SQUAREFACTORY #endif //AUD_SQUAREFACTORY

2
intern/audaspace/FX/AUD_SumFactory.cpp
View File

@@ -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; std::vector<float> a, b;
a.push_back(1); a.push_back(1);

2
intern/audaspace/FX/AUD_SumFactory.h
View File

@@ -51,7 +51,7 @@ public:
*/ */
AUD_SumFactory(AUD_Reference<AUD_IFactory> factory); AUD_SumFactory(AUD_Reference<AUD_IFactory> factory);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_SUMFACTORY #endif //AUD_SUMFACTORY

2
intern/audaspace/FX/AUD_SuperposeFactory.cpp
View File

@@ -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> reader1 = m_factory1->createReader();
AUD_Reference<AUD_IReader> reader2 = m_factory2->createReader(); AUD_Reference<AUD_IReader> reader2 = m_factory2->createReader();

2
intern/audaspace/FX/AUD_SuperposeFactory.h
View File

@@ -63,7 +63,7 @@ public:
*/ */
AUD_SuperposeFactory(AUD_Reference<AUD_IFactory> factory1, AUD_Reference<AUD_IFactory> factory2); 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 #endif //AUD_SUPERPOSEFACTORY

2
intern/audaspace/FX/AUD_VolumeFactory.cpp
View File

@@ -43,7 +43,7 @@ float AUD_VolumeFactory::getVolume() const
return m_volume; return m_volume;
} }
AUD_Reference<AUD_IReader> AUD_VolumeFactory::createReader() const AUD_Reference<AUD_IReader> AUD_VolumeFactory::createReader()
{ {
std::vector<float> a, b; std::vector<float> a, b;
a.push_back(1); a.push_back(1);

2
intern/audaspace/FX/AUD_VolumeFactory.h
View File

@@ -64,7 +64,7 @@ public:
*/ */
float getVolume() const; float getVolume() const;
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_VOLUMEFACTORY #endif //AUD_VOLUMEFACTORY

2
intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
View File

@@ -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(); AUD_Reference<AUD_IReader> reader = getReader();

2
intern/audaspace/SRC/AUD_SRCResampleFactory.h
View File

@@ -48,7 +48,7 @@ private:
public: public:
AUD_SRCResampleFactory(AUD_Reference<AUD_IFactory> factory, AUD_DeviceSpecs specs); 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 #endif //AUD_SRCRESAMPLEFACTORY

2
intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
View File

@@ -49,7 +49,7 @@ AUD_FFMPEGFactory::AUD_FFMPEGFactory(const data_t* buffer, int size) :
memcpy(m_buffer->getBuffer(), buffer, 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()) if(m_buffer.isNull())
return new AUD_FFMPEGReader(m_filename); return new AUD_FFMPEGReader(m_filename);

2
intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
View File

@@ -74,7 +74,7 @@ public:
*/ */
AUD_FFMPEGFactory(const data_t* buffer, int size); AUD_FFMPEGFactory(const data_t* buffer, int size);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_FFMPEGFACTORY #endif //AUD_FFMPEGFACTORY

2
intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
View File

@@ -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(); AUD_Reference<AUD_IReader> reader = getReader();
int ic = reader->getSpecs().channels; int ic = reader->getSpecs().channels;

2
intern/audaspace/intern/AUD_ChannelMapperFactory.h
View File

@@ -67,7 +67,7 @@ public:
*/ */
void deleteMapping(int ic); void deleteMapping(int ic);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_CHANNELMAPPERFACTORY #endif //AUD_CHANNELMAPPERFACTORY

2
intern/audaspace/intern/AUD_ConverterFactory.cpp
View File

@@ -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(); AUD_Reference<AUD_IReader> reader = getReader();

2
intern/audaspace/intern/AUD_ConverterFactory.h
View File

@@ -48,7 +48,7 @@ private:
public: public:
AUD_ConverterFactory(AUD_Reference<AUD_IFactory> factory, AUD_DeviceSpecs specs); 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 #endif //AUD_CONVERTERFACTORY

2
intern/audaspace/intern/AUD_FileFactory.cpp
View File

@@ -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."; 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 #ifdef WITH_SNDFILE
try try

2
intern/audaspace/intern/AUD_FileFactory.h
View File

@@ -72,7 +72,7 @@ public:
*/ */
AUD_FileFactory(const data_t* buffer, int size); AUD_FileFactory(const data_t* buffer, int size);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_FILEFACTORY #endif //AUD_FILEFACTORY

2
intern/audaspace/intern/AUD_IFactory.h
View File

@@ -56,7 +56,7 @@ public:
* \exception AUD_Exception An exception may be thrown if there has been * \exception AUD_Exception An exception may be thrown if there has been
* a more unexpected error during reader creation. * 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 #endif //AUD_IFACTORY

2
intern/audaspace/intern/AUD_LinearResampleFactory.cpp
View File

@@ -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(); AUD_Reference<AUD_IReader> reader = getReader();

2
intern/audaspace/intern/AUD_LinearResampleFactory.h
View File

@@ -47,7 +47,7 @@ private:
public: public:
AUD_LinearResampleFactory(AUD_Reference<AUD_IFactory> factory, AUD_DeviceSpecs specs); 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 #endif //AUD_LINEARRESAMPLEFACTORY

19
intern/audaspace/intern/AUD_SequencerFactory.cpp
View File

@@ -63,16 +63,6 @@ bool AUD_SequencerFactory::getMute() const
return m_muted; 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> AUD_SequencerFactory::add(AUD_Reference<AUD_IFactory>** sound, float begin, float end, float skip, void* data)
{ {
AUD_Reference<AUD_SequencerEntry> entry = new AUD_SequencerEntry; 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; 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) void AUD_SequencerFactory::removeReader(AUD_Reference<AUD_SequencerReader> reader)

4
intern/audaspace/intern/AUD_SequencerFactory.h
View File

@@ -68,8 +68,6 @@ private:
AUD_volumeFunction m_volume; AUD_volumeFunction m_volume;
AUD_Reference<AUD_SequencerFactory>* m_this; AUD_Reference<AUD_SequencerFactory>* m_this;
AUD_Reference<AUD_IReader> newReader();
// hide copy constructor and operator= // hide copy constructor and operator=
AUD_SequencerFactory(const AUD_SequencerFactory&); AUD_SequencerFactory(const AUD_SequencerFactory&);
AUD_SequencerFactory& operator=(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 move(AUD_Reference<AUD_SequencerEntry> entry, float begin, float end, float skip);
void mute(AUD_Reference<AUD_SequencerEntry> entry, bool mute); 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); void removeReader(AUD_Reference<AUD_SequencerReader> reader);
}; };

2
intern/audaspace/intern/AUD_SilenceFactory.cpp
View File

@@ -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(); return new AUD_SilenceReader();
} }

2
intern/audaspace/intern/AUD_SilenceFactory.h
View File

@@ -50,7 +50,7 @@ public:
*/ */
AUD_SilenceFactory(); AUD_SilenceFactory();
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_SILENCEFACTORY #endif //AUD_SILENCEFACTORY

2
intern/audaspace/intern/AUD_SinusFactory.cpp
View File

@@ -44,7 +44,7 @@ float AUD_SinusFactory::getFrequency() const
return m_frequency; 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); return new AUD_SinusReader(m_frequency, m_sampleRate);
} }

2
intern/audaspace/intern/AUD_SinusFactory.h
View File

@@ -68,7 +68,7 @@ public:
*/ */
float getFrequency() const; float getFrequency() const;
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_SINUSFACTORY #endif //AUD_SINUSFACTORY

2
intern/audaspace/intern/AUD_StreamBufferFactory.cpp
View File

@@ -70,7 +70,7 @@ AUD_StreamBufferFactory::AUD_StreamBufferFactory(AUD_Reference<AUD_IFactory> fac
m_buffer->resize(index * sample_size, true); 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); return new AUD_BufferReader(m_buffer, m_specs);
} }

2
intern/audaspace/intern/AUD_StreamBufferFactory.h
View File

@@ -66,7 +66,7 @@ public:
*/ */
AUD_StreamBufferFactory(AUD_Reference<AUD_IFactory> factory); AUD_StreamBufferFactory(AUD_Reference<AUD_IFactory> factory);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_STREAMBUFFERFACTORY #endif //AUD_STREAMBUFFERFACTORY

2
intern/audaspace/sndfile/AUD_SndFileFactory.cpp
View File

@@ -46,7 +46,7 @@ AUD_SndFileFactory::AUD_SndFileFactory(const data_t* buffer, int size) :
memcpy(m_buffer->getBuffer(), buffer, 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()) if(m_buffer.isNull())
return new AUD_SndFileReader(m_filename); return new AUD_SndFileReader(m_filename);

2
intern/audaspace/sndfile/AUD_SndFileFactory.h
View File

@@ -72,7 +72,7 @@ public:
*/ */
AUD_SndFileFactory(const data_t* buffer, int size); AUD_SndFileFactory(const data_t* buffer, int size);
virtual AUD_Reference<AUD_IReader> createReader() const; virtual AUD_Reference<AUD_IReader> createReader();
}; };
#endif //AUD_SNDFILEFACTORY #endif //AUD_SNDFILEFACTORY