[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51908] trunk/blender: Audaspace:
Joerg Mueller
nexyon at gmail.com
Mon Nov 5 15:24:40 CET 2012
Revision: 51908
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51908
Author: nexyon
Date: 2012-11-05 14:24:35 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Audaspace:
Replacing AUD_Reference with boost::shared_ptr.
Modified Paths:
--------------
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.h
trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h
trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
trunk/blender/intern/audaspace/FX/AUD_DelayFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_DelayFactory.h
trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp
trunk/blender/intern/audaspace/FX/AUD_DelayReader.h
trunk/blender/intern/audaspace/FX/AUD_DoubleFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_DoubleFactory.h
trunk/blender/intern/audaspace/FX/AUD_DoubleReader.cpp
trunk/blender/intern/audaspace/FX/AUD_DoubleReader.h
trunk/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
trunk/blender/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
trunk/blender/intern/audaspace/FX/AUD_EffectFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_EffectFactory.h
trunk/blender/intern/audaspace/FX/AUD_EffectReader.cpp
trunk/blender/intern/audaspace/FX/AUD_EffectReader.h
trunk/blender/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_EnvelopeFactory.h
trunk/blender/intern/audaspace/FX/AUD_FaderFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_FaderFactory.h
trunk/blender/intern/audaspace/FX/AUD_FaderReader.cpp
trunk/blender/intern/audaspace/FX/AUD_FaderReader.h
trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.h
trunk/blender/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_IIRFilterFactory.h
trunk/blender/intern/audaspace/FX/AUD_IIRFilterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_IIRFilterReader.h
trunk/blender/intern/audaspace/FX/AUD_LimiterFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_LimiterFactory.h
trunk/blender/intern/audaspace/FX/AUD_LimiterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_LimiterReader.h
trunk/blender/intern/audaspace/FX/AUD_LoopFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_LoopFactory.h
trunk/blender/intern/audaspace/FX/AUD_LoopReader.cpp
trunk/blender/intern/audaspace/FX/AUD_LoopReader.h
trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.h
trunk/blender/intern/audaspace/FX/AUD_PingPongFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_PingPongFactory.h
trunk/blender/intern/audaspace/FX/AUD_PitchFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_PitchFactory.h
trunk/blender/intern/audaspace/FX/AUD_PitchReader.cpp
trunk/blender/intern/audaspace/FX/AUD_PitchReader.h
trunk/blender/intern/audaspace/FX/AUD_RectifyFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_RectifyFactory.h
trunk/blender/intern/audaspace/FX/AUD_ReverseFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_ReverseFactory.h
trunk/blender/intern/audaspace/FX/AUD_ReverseReader.cpp
trunk/blender/intern/audaspace/FX/AUD_ReverseReader.h
trunk/blender/intern/audaspace/FX/AUD_SquareFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_SquareFactory.h
trunk/blender/intern/audaspace/FX/AUD_SumFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_SumFactory.h
trunk/blender/intern/audaspace/FX/AUD_SuperposeFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_SuperposeFactory.h
trunk/blender/intern/audaspace/FX/AUD_SuperposeReader.cpp
trunk/blender/intern/audaspace/FX/AUD_SuperposeReader.h
trunk/blender/intern/audaspace/FX/AUD_VolumeFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_VolumeFactory.h
trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.h
trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp
trunk/blender/intern/audaspace/SConscript
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
trunk/blender/intern/audaspace/intern/AUD_BufferReader.cpp
trunk/blender/intern/audaspace/intern/AUD_BufferReader.h
trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
trunk/blender/intern/audaspace/intern/AUD_C-API.h
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperFactory.h
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.h
trunk/blender/intern/audaspace/intern/AUD_ConverterFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_ConverterFactory.h
trunk/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
trunk/blender/intern/audaspace/intern/AUD_ConverterReader.h
trunk/blender/intern/audaspace/intern/AUD_FileFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_FileFactory.h
trunk/blender/intern/audaspace/intern/AUD_FileWriter.cpp
trunk/blender/intern/audaspace/intern/AUD_FileWriter.h
trunk/blender/intern/audaspace/intern/AUD_IDevice.h
trunk/blender/intern/audaspace/intern/AUD_IFactory.h
trunk/blender/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_JOSResampleFactory.h
trunk/blender/intern/audaspace/intern/AUD_JOSResampleReader.cpp
trunk/blender/intern/audaspace/intern/AUD_JOSResampleReader.h
trunk/blender/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_LinearResampleFactory.h
trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.cpp
trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.h
trunk/blender/intern/audaspace/intern/AUD_Mixer.h
trunk/blender/intern/audaspace/intern/AUD_MixerFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_MixerFactory.h
trunk/blender/intern/audaspace/intern/AUD_NULLDevice.cpp
trunk/blender/intern/audaspace/intern/AUD_NULLDevice.h
trunk/blender/intern/audaspace/intern/AUD_ResampleReader.cpp
trunk/blender/intern/audaspace/intern/AUD_ResampleReader.h
trunk/blender/intern/audaspace/intern/AUD_SequencerEntry.cpp
trunk/blender/intern/audaspace/intern/AUD_SequencerEntry.h
trunk/blender/intern/audaspace/intern/AUD_SequencerFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_SequencerFactory.h
trunk/blender/intern/audaspace/intern/AUD_SequencerHandle.cpp
trunk/blender/intern/audaspace/intern/AUD_SequencerHandle.h
trunk/blender/intern/audaspace/intern/AUD_SequencerReader.cpp
trunk/blender/intern/audaspace/intern/AUD_SequencerReader.h
trunk/blender/intern/audaspace/intern/AUD_SilenceFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_SilenceFactory.h
trunk/blender/intern/audaspace/intern/AUD_SinusFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_SinusFactory.h
trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.h
trunk/blender/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_StreamBufferFactory.h
trunk/blender/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
trunk/blender/intern/audaspace/sndfile/AUD_SndFileFactory.h
trunk/blender/intern/audaspace/sndfile/AUD_SndFileReader.cpp
trunk/blender/intern/audaspace/sndfile/AUD_SndFileReader.h
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.h
Added Paths:
-----------
trunk/blender/intern/audaspace/FX/AUD_IDynamicIIRFilterCalculator.h
trunk/blender/intern/audaspace/intern/AUD_Sequencer.cpp
trunk/blender/intern/audaspace/intern/AUD_Sequencer.h
Removed Paths:
-------------
trunk/blender/intern/audaspace/intern/AUD_Reference.h
trunk/blender/intern/audaspace/intern/AUD_ReferenceHandler.cpp
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2012-11-05 14:24:35 UTC (rev 51908)
@@ -28,6 +28,7 @@
set(INC_SYS
${PTHREADS_INCLUDE_DIRS}
+ ${BOOST_INCLUDE_DIR}
)
set(SRC
@@ -120,6 +121,8 @@
intern/AUD_ResampleFactory.h
intern/AUD_ResampleReader.cpp
intern/AUD_ResampleReader.h
+ intern/AUD_Sequencer.cpp
+ intern/AUD_Sequencer.h
intern/AUD_SequencerEntry.cpp
intern/AUD_SequencerEntry.h
intern/AUD_SequencerFactory.cpp
@@ -150,6 +153,7 @@
FX/AUD_DelayReader.h
FX/AUD_DoubleFactory.h
FX/AUD_DoubleReader.h
+ FX/AUD_IDynamicIIRFilterCalculator.h
FX/AUD_DynamicIIRFilterFactory.h
FX/AUD_DynamicIIRFilterReader.h
FX/AUD_EffectFactory.h
Modified: trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.cpp 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.cpp 2012-11-05 14:24:35 UTC (rev 51908)
@@ -50,15 +50,15 @@
return out;
}
-AUD_AccumulatorFactory::AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory,
+AUD_AccumulatorFactory::AUD_AccumulatorFactory(boost::shared_ptr<AUD_IFactory> factory,
bool additive) :
AUD_EffectFactory(factory),
m_additive(additive)
{
}
-AUD_Reference<AUD_IReader> AUD_AccumulatorFactory::createReader()
+boost::shared_ptr<AUD_IReader> AUD_AccumulatorFactory::createReader()
{
- return new AUD_CallbackIIRFilterReader(getReader(), 2, 2,
- m_additive ? accumulatorFilterAdditive : accumulatorFilter);
+ return boost::shared_ptr<AUD_IReader>(new AUD_CallbackIIRFilterReader(getReader(), 2, 2,
+ m_additive ? accumulatorFilterAdditive : accumulatorFilter));
}
Modified: trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.h 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.h 2012-11-05 14:24:35 UTC (rev 51908)
@@ -58,9 +58,9 @@
* \param factory The input factory.
* \param additive Whether the accumulator is additive.
*/
- AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory, bool additive = false);
+ AUD_AccumulatorFactory(boost::shared_ptr<AUD_IFactory> factory, bool additive = false);
- virtual AUD_Reference<AUD_IReader> createReader();
+ virtual boost::shared_ptr<AUD_IReader> createReader();
static sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless);
static sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless);
Modified: trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp 2012-11-05 14:24:35 UTC (rev 51908)
@@ -33,7 +33,7 @@
#define CC m_specs.channels + m_channel
-AUD_BaseIIRFilterReader::AUD_BaseIIRFilterReader(AUD_Reference<AUD_IReader> reader, int in,
+AUD_BaseIIRFilterReader::AUD_BaseIIRFilterReader(boost::shared_ptr<AUD_IReader> reader, int in,
int out) :
AUD_EffectReader(reader),
m_specs(reader->getSpecs()),
Modified: trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.h 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.h 2012-11-05 14:24:35 UTC (rev 51908)
@@ -90,7 +90,7 @@
* \param in The count of past input samples needed.
* \param out The count of past output samples needed.
*/
- AUD_BaseIIRFilterReader(AUD_Reference<AUD_IReader> reader, int in, int out);
+ AUD_BaseIIRFilterReader(boost::shared_ptr<AUD_IReader> reader, int in, int out);
void setLengths(int in, int out);
Modified: trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp 2012-11-05 14:24:35 UTC (rev 51908)
@@ -39,7 +39,7 @@
#define BWPB41 0.76536686473
#define BWPB42 1.84775906502
-AUD_ButterworthFactory::AUD_ButterworthFactory(AUD_Reference<AUD_IFactory> factory,
+AUD_ButterworthFactory::AUD_ButterworthFactory(boost::shared_ptr<AUD_IFactory> factory,
float frequency) :
AUD_DynamicIIRFilterFactory(factory),
m_frequency(frequency)
Modified: trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h 2012-11-05 14:24:35 UTC (rev 51908)
@@ -53,7 +53,7 @@
* \param factory The input factory.
* \param frequency The cutoff frequency.
*/
- AUD_ButterworthFactory(AUD_Reference<AUD_IFactory> factory, float frequency);
+ AUD_ButterworthFactory(boost::shared_ptr<AUD_IFactory> factory, float frequency);
virtual void recalculateCoefficients(AUD_SampleRate rate,
std::vector<float>& b,
Modified: trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp 2012-11-05 14:24:35 UTC (rev 51908)
@@ -29,7 +29,7 @@
#include "AUD_CallbackIIRFilterReader.h"
-AUD_CallbackIIRFilterReader::AUD_CallbackIIRFilterReader(AUD_Reference<AUD_IReader> reader,
+AUD_CallbackIIRFilterReader::AUD_CallbackIIRFilterReader(boost::shared_ptr<AUD_IReader> reader,
int in, int out,
doFilterIIR doFilter,
endFilterIIR endFilter,
Modified: trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h 2012-11-05 14:24:35 UTC (rev 51908)
@@ -74,7 +74,7 @@
* \param endFilter The finishing callback.
* \param data Data pointer for the callbacks.
*/
- AUD_CallbackIIRFilterReader(AUD_Reference<AUD_IReader> reader, int in, int out,
+ AUD_CallbackIIRFilterReader(boost::shared_ptr<AUD_IReader> reader, int in, int out,
doFilterIIR doFilter,
endFilterIIR endFilter = 0,
void* data = 0);
Modified: trunk/blender/intern/audaspace/FX/AUD_DelayFactory.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_DelayFactory.cpp 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_DelayFactory.cpp 2012-11-05 14:24:35 UTC (rev 51908)
@@ -31,7 +31,7 @@
#include "AUD_DelayReader.h"
#include "AUD_Space.h"
-AUD_DelayFactory::AUD_DelayFactory(AUD_Reference<AUD_IFactory> factory, float delay) :
+AUD_DelayFactory::AUD_DelayFactory(boost::shared_ptr<AUD_IFactory> factory, float delay) :
AUD_EffectFactory(factory),
m_delay(delay)
{
@@ -42,7 +42,7 @@
return m_delay;
}
-AUD_Reference<AUD_IReader> AUD_DelayFactory::createReader()
+boost::shared_ptr<AUD_IReader> AUD_DelayFactory::createReader()
{
- return new AUD_DelayReader(getReader(), m_delay);
+ return boost::shared_ptr<AUD_IReader>(new AUD_DelayReader(getReader(), m_delay));
}
Modified: trunk/blender/intern/audaspace/FX/AUD_DelayFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_DelayFactory.h 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_DelayFactory.h 2012-11-05 14:24:35 UTC (rev 51908)
@@ -53,14 +53,14 @@
* \param factory The input factory.
* \param delay The desired delay in seconds.
*/
- AUD_DelayFactory(AUD_Reference<AUD_IFactory> factory, float delay = 0);
+ AUD_DelayFactory(boost::shared_ptr<AUD_IFactory> factory, float delay = 0);
/**
* Returns the delay in seconds.
*/
float getDelay() const;
- virtual AUD_Reference<AUD_IReader> createReader();
+ virtual boost::shared_ptr<AUD_IReader> createReader();
};
#endif //__AUD_DELAYFACTORY_H__
Modified: trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp 2012-11-05 14:24:35 UTC (rev 51908)
@@ -31,7 +31,7 @@
#include <cstring>
-AUD_DelayReader::AUD_DelayReader(AUD_Reference<AUD_IReader> reader, float delay) :
+AUD_DelayReader::AUD_DelayReader(boost::shared_ptr<AUD_IReader> reader, float delay) :
AUD_EffectReader(reader),
m_delay(int((AUD_SampleRate)delay * reader->getSpecs().rate)),
m_remdelay(int((AUD_SampleRate)delay * reader->getSpecs().rate))
Modified: trunk/blender/intern/audaspace/FX/AUD_DelayReader.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_DelayReader.h 2012-11-05 14:09:08 UTC (rev 51907)
+++ trunk/blender/intern/audaspace/FX/AUD_DelayReader.h 2012-11-05 14:24:35 UTC (rev 51908)
@@ -59,7 +59,7 @@
* \param reader The reader to read from.
* \param delay The delay in seconds.
*/
- AUD_DelayReader(AUD_Reference<AUD_IReader> reader, float delay);
+ AUD_DelayReader(boost::shared_ptr<AUD_IReader> reader, float delay);
virtual void seek(int position);
virtual int getLength() const;
Modified: trunk/blender/intern/audaspace/FX/AUD_DoubleFactory.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_DoubleFactory.cpp 2012-11-05 14:09:08 UTC (rev 51907)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list