3D Audio GSoC:
Removing unneeded const from Factory::createReader.
This commit is contained in:
@@ -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);
|
||||
|
@@ -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
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -62,7 +62,7 @@ public:
|
||||
*/
|
||||
float getDelay() const;
|
||||
|
||||
virtual AUD_Reference<AUD_IReader> createReader() const;
|
||||
virtual AUD_Reference<AUD_IReader> createReader();
|
||||
};
|
||||
|
||||
#endif //AUD_DELAYFACTORY
|
||||
|
@@ -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();
|
||||
|
@@ -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
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -88,7 +88,7 @@ public:
|
||||
*/
|
||||
float getLength() const;
|
||||
|
||||
virtual AUD_Reference<AUD_IReader> createReader() const;
|
||||
virtual AUD_Reference<AUD_IReader> createReader();
|
||||
};
|
||||
|
||||
#endif //AUD_FADERFACTORY
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -75,7 +75,7 @@ public:
|
||||
*/
|
||||
float getEnd() const;
|
||||
|
||||
virtual AUD_Reference<AUD_IReader> createReader() const;
|
||||
virtual AUD_Reference<AUD_IReader> createReader();
|
||||
};
|
||||
|
||||
#endif //AUD_LIMITERFACTORY
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -64,7 +64,7 @@ public:
|
||||
*/
|
||||
int getLoop() const;
|
||||
|
||||
virtual AUD_Reference<AUD_IReader> createReader() const;
|
||||
virtual AUD_Reference<AUD_IReader> createReader();
|
||||
};
|
||||
|
||||
#endif //AUD_LOOPFACTORY
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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());
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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,
|
||||
|
@@ -62,7 +62,7 @@ public:
|
||||
*/
|
||||
float getThreshold() const;
|
||||
|
||||
virtual AUD_Reference<AUD_IReader> createReader() const;
|
||||
virtual AUD_Reference<AUD_IReader> createReader();
|
||||
};
|
||||
|
||||
#endif //AUD_SQUAREFACTORY
|
||||
|
@@ -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);
|
||||
|
@@ -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
|
||||
|
@@ -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();
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
|
@@ -64,7 +64,7 @@ public:
|
||||
*/
|
||||
float getVolume() const;
|
||||
|
||||
virtual AUD_Reference<AUD_IReader> createReader() const;
|
||||
virtual AUD_Reference<AUD_IReader> createReader();
|
||||
};
|
||||
|
||||
#endif //AUD_VOLUMEFACTORY
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
|
@@ -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
|
||||
|
@@ -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;
|
||||
|
@@ -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
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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();
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
||||
|
@@ -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);
|
||||
};
|
||||
|
@@ -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();
|
||||
}
|
||||
|
@@ -50,7 +50,7 @@ public:
|
||||
*/
|
||||
AUD_SilenceFactory();
|
||||
|
||||
virtual AUD_Reference<AUD_IReader> createReader() const;
|
||||
virtual AUD_Reference<AUD_IReader> createReader();
|
||||
};
|
||||
|
||||
#endif //AUD_SILENCEFACTORY
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -68,7 +68,7 @@ public:
|
||||
*/
|
||||
float getFrequency() const;
|
||||
|
||||
virtual AUD_Reference<AUD_IReader> createReader() const;
|
||||
virtual AUD_Reference<AUD_IReader> createReader();
|
||||
};
|
||||
|
||||
#endif //AUD_SINUSFACTORY
|
||||
|
@@ -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);
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user