Revision: 37152
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37152
Author: nexyon
Date: 2011-06-03 23:56:15 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Merging pepper branch revision 37151.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37151
Modified Paths:
--------------
branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_EffectFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_EffectReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_EffectReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_EnvelopeFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_FaderFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_FaderReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_FaderReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_HighpassFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_HighpassFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_IIRFilterFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_IIRFilterReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_LimiterFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_LimiterReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_LoopFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_LoopReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_LoopReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_LowpassFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_LowpassFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_PingPongFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_PitchFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_PitchReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_PitchReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_RectifyFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_ReverseFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_ReverseReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_SquareFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_SquareFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_SumFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_SumFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_SuperposeFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_SuperposeFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_SuperposeReader.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_SuperposeReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/soc-2011-salad/intern/audaspace/FX/AUD_VolumeFactory.h
branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-salad/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-salad/intern/audaspace/Python/AUD_PyAPI.h
branches/soc-2011-salad/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
branches/soc-2011-salad/intern/audaspace/SRC/AUD_SRCResampleFactory.h
branches/soc-2011-salad/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
branches/soc-2011-salad/intern/audaspace/SRC/AUD_SRCResampleReader.h
branches/soc-2011-salad/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/soc-2011-salad/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/soc-2011-salad/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_BufferReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_C-API.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_DefaultMixer.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_DefaultMixer.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_FileFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_FileFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_IDevice.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_IFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_LinearResampleFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_LinearResampleReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_LinearResampleReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_Mixer.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_MixerFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_NULLDevice.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_Reference.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SilenceFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SilenceFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SinusFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/soc-2011-salad/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
branches/soc-2011-salad/intern/audaspace/sndfile/AUD_SndFileFactory.h
branches/soc-2011-salad/intern/audaspace/sndfile/AUD_SndFileReader.cpp
branches/soc-2011-salad/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-salad/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-salad/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-salad/source/blender/collada/AnimationExporter.h
branches/soc-2011-salad/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-salad/source/blender/editors/animation/anim_markers.c
branches/soc-2011-salad/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-salad/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-salad/source/blender/editors/animation/keyingsets.c
branches/soc-2011-salad/source/blender/editors/include/ED_markers.h
branches/soc-2011-salad/source/blender/editors/interface/resources.c
branches/soc-2011-salad/source/blender/editors/space_action/action_ops.c
branches/soc-2011-salad/source/blender/editors/space_graph/graph_ops.c
branches/soc-2011-salad/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_ops.c
branches/soc-2011-salad/source/blender/editors/transform/transform.c
branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-salad/source/blender/makesdna/DNA_anim_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-salad/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-salad/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2011-salad/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/BL_Action.h
branches/soc-2011-salad/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2011-salad/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_GameObject.h
Added Paths:
-----------
branches/soc-2011-salad/release/scripts/modules/retarget.py
Property Changed:
----------------
branches/soc-2011-salad/
branches/soc-2011-salad/source/blender/collada/AnimationExporter.cpp
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-pepper:36830-36989
/trunk/blender:36834-37147
+ /branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-pepper:36830-37151
/trunk/blender:36834-37149
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
2011-06-03 23:56:15 UTC (rev 37152)
@@ -52,14 +52,14 @@
return out;
}
-AUD_AccumulatorFactory::AUD_AccumulatorFactory(AUD_IFactory* factory,
+AUD_AccumulatorFactory::AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory>
factory,
bool additive) :
AUD_EffectFactory(factory),
m_additive(additive)
{
}
-AUD_IReader* AUD_AccumulatorFactory::createReader() const
+AUD_Reference<AUD_IReader> AUD_AccumulatorFactory::createReader() const
{
return new AUD_CallbackIIRFilterReader(getReader(), 2, 2,
m_additive ?
accumulatorFilterAdditive : accumulatorFilter);
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h
2011-06-03 23:56:15 UTC (rev 37152)
@@ -55,9 +55,9 @@
* \param factory The input factory.
* \param additive Whether the accumulator is additive.
*/
- AUD_AccumulatorFactory(AUD_IFactory* factory, bool additive = false);
+ AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory, bool
additive = false);
- virtual AUD_IReader* createReader() const;
+ virtual AUD_Reference<AUD_IReader> createReader() const;
};
#endif //AUD_ACCUMULATORFACTORY
Modified:
branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
2011-06-03 23:56:15 UTC (rev 37152)
@@ -35,7 +35,7 @@
#define CC m_channels + m_channel
-AUD_BaseIIRFilterReader::AUD_BaseIIRFilterReader(AUD_IReader* reader, int in,
+AUD_BaseIIRFilterReader::AUD_BaseIIRFilterReader(AUD_Reference<AUD_IReader>
reader, int in,
int out) :
AUD_EffectReader(reader),
m_channels(reader->getSpecs().channels),
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
2011-06-03 23:56:15 UTC (rev 37152)
@@ -97,7 +97,7 @@
* \param in The count of past input samples needed.
* \param out The count of past output samples needed.
*/
- AUD_BaseIIRFilterReader(AUD_IReader* reader, int in, int out);
+ AUD_BaseIIRFilterReader(AUD_Reference<AUD_IReader> reader, int in, int
out);
public:
inline sample_t x(int pos)
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.cpp
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.cpp
2011-06-03 23:56:15 UTC (rev 37152)
@@ -41,16 +41,16 @@
#define BWPB41 0.76536686473
#define BWPB42 1.84775906502
-AUD_ButterworthFactory::AUD_ButterworthFactory(AUD_IFactory* factory,
+AUD_ButterworthFactory::AUD_ButterworthFactory(AUD_Reference<AUD_IFactory>
factory,
float frequency) :
AUD_EffectFactory(factory),
m_frequency(frequency)
{
}
-AUD_IReader* AUD_ButterworthFactory::createReader() const
+AUD_Reference<AUD_IReader> AUD_ButterworthFactory::createReader() const
{
- AUD_IReader* reader = getReader();
+ AUD_Reference<AUD_IReader> reader = getReader();
// calculate coefficients
float omega = 2 * tan(m_frequency * M_PI / reader->getSpecs().rate);
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.h
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.h
2011-06-03 23:56:15 UTC (rev 37152)
@@ -55,9 +55,9 @@
* \param factory The input factory.
* \param frequency The cutoff frequency.
*/
- AUD_ButterworthFactory(AUD_IFactory* factory, float frequency);
+ AUD_ButterworthFactory(AUD_Reference<AUD_IFactory> factory, float
frequency);
- virtual AUD_IReader* createReader() const;
+ virtual AUD_Reference<AUD_IReader> createReader() const;
};
#endif //AUD_BUTTERWORTHFACTORY
Modified:
branches/soc-2011-salad/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
2011-06-03 23:56:15 UTC (rev 37152)
@@ -31,7 +31,7 @@
#include "AUD_CallbackIIRFilterReader.h"
-AUD_CallbackIIRFilterReader::AUD_CallbackIIRFilterReader(AUD_IReader* reader,
+AUD_CallbackIIRFilterReader::AUD_CallbackIIRFilterReader(AUD_Reference<AUD_IReader>
reader,
int in, int out,
doFilterIIR doFilter,
endFilterIIR endFilter,
Modified:
branches/soc-2011-salad/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
2011-06-03 23:56:15 UTC (rev 37152)
@@ -76,7 +76,7 @@
* \param endFilter The finishing callback.
* \param data Data pointer for the callbacks.
*/
- AUD_CallbackIIRFilterReader(AUD_IReader* reader, int in, int out,
+ AUD_CallbackIIRFilterReader(AUD_Reference<AUD_IReader> reader, int in,
int out,
doFilterIIR
doFilter,
endFilterIIR
endFilter = 0,
void* data = 0);
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayFactory.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayFactory.cpp
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayFactory.cpp
2011-06-03 23:56:15 UTC (rev 37152)
@@ -33,7 +33,7 @@
#include "AUD_DelayReader.h"
#include "AUD_Space.h"
-AUD_DelayFactory::AUD_DelayFactory(AUD_IFactory* factory, float delay) :
+AUD_DelayFactory::AUD_DelayFactory(AUD_Reference<AUD_IFactory> factory, float
delay) :
AUD_EffectFactory(factory),
m_delay(delay)
{
@@ -44,7 +44,7 @@
return m_delay;
}
-AUD_IReader* AUD_DelayFactory::createReader() const
+AUD_Reference<AUD_IReader> AUD_DelayFactory::createReader() const
{
return new AUD_DelayReader(getReader(), m_delay);
}
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayFactory.h
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayFactory.h
2011-06-03 23:56:15 UTC (rev 37152)
@@ -55,14 +55,14 @@
* \param factory The input factory.
* \param delay The desired delay in seconds.
*/
- AUD_DelayFactory(AUD_IFactory* factory, float delay = 0);
+ AUD_DelayFactory(AUD_Reference<AUD_IFactory> factory, float delay = 0);
/**
* Returns the delay in seconds.
*/
float getDelay() const;
- virtual AUD_IReader* createReader() const;
+ virtual AUD_Reference<AUD_IReader> createReader() const;
};
#endif //AUD_DELAYFACTORY
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.cpp
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.cpp
2011-06-03 23:56:15 UTC (rev 37152)
@@ -33,7 +33,7 @@
#include <cstring>
-AUD_DelayReader::AUD_DelayReader(AUD_IReader* reader, float delay) :
+AUD_DelayReader::AUD_DelayReader(AUD_Reference<AUD_IReader> reader, float
delay) :
AUD_EffectReader(reader),
m_delay(int(delay * reader->getSpecs().rate)),
m_remdelay(int(delay * reader->getSpecs().rate)),
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.h
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.h
2011-06-03 23:56:15 UTC (rev 37152)
@@ -71,7 +71,7 @@
* \param reader The reader to read from.
* \param delay The delay in seconds.
*/
- AUD_DelayReader(AUD_IReader* reader, float delay);
+ AUD_DelayReader(AUD_Reference<AUD_IReader> reader, float delay);
virtual void seek(int position);
virtual int getLength() const;
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleFactory.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleFactory.cpp
2011-06-03 23:28:57 UTC (rev 37151)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleFactory.cpp
2011-06-03 23:56:15 UTC (rev 37152)
@@ -32,25 +32,15 @@
#include "AUD_DoubleFactory.h"
#include "AUD_DoubleReader.h"
-AUD_DoubleFactory::AUD_DoubleFactory(AUD_IFactory* factory1, AUD_IFactory*
factory2) :
+AUD_DoubleFactory::AUD_DoubleFactory(AUD_Reference<AUD_IFactory> factory1,
AUD_Reference<AUD_IFactory> factory2) :
m_factory1(factory1), m_factory2(factory2)
{
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
