[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39450] branches/soc-2011-salad: Merged pepper up to r39449.
Joerg Mueller
nexyon at gmail.com
Tue Aug 16 16:38:46 CEST 2011
Revision: 39450
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39450
Author: nexyon
Date: 2011-08-16 14:38:46 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
Merged pepper up to r39449.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39449
Modified Paths:
--------------
branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.h
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_DynamicIIRFilterFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_HighpassFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_LimiterReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_LowpassFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_PingPongFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_PitchReader.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_ReverseFactory.h
branches/soc-2011-salad/intern/audaspace/FX/AUD_ReverseReader.h
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.h
branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-salad/intern/audaspace/SRC/AUD_SRCResampleFactory.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.h
branches/soc-2011-salad/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_3DMath.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_AnimateableProperty.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_AnimateableProperty.h
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.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFactory.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_FileWriter.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_I3DHandle.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_IDevice.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_LinearResampleFactory.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_Mixer.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ReadDevice.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_ReadDevice.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_Reference.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_ResampleReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerEntry.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_SequencerHandle.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SequencerHandle.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.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SilenceReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_SinusReader.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_Space.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/soc-2011-salad/intern/audaspace/jack/AUD_JackDevice.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_SndFileWriter.h
branches/soc-2011-salad/release/scripts/modules/mocap_constraints.py
branches/soc-2011-salad/release/scripts/modules/mocap_tools.py
branches/soc-2011-salad/release/scripts/modules/retarget.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-salad/release/scripts/startup/ui_mocap.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_action.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_anim.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_armature.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_constraint.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_nla.h
branches/soc-2011-salad/source/blender/blenkernel/intern/action.c
branches/soc-2011-salad/source/blender/blenkernel/intern/anim.c
branches/soc-2011-salad/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-salad/source/blender/blenkernel/intern/armature.c
branches/soc-2011-salad/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-salad/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-salad/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-salad/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-salad/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-salad/source/blender/blenkernel/intern/nla.c
branches/soc-2011-salad/source/blender/blenkernel/intern/sound.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/collada/AnimationImporter.cpp
branches/soc-2011-salad/source/blender/collada/AnimationImporter.h
branches/soc-2011-salad/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-salad/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-salad/source/blender/collada/ExtraHandler.cpp
branches/soc-2011-salad/source/blender/collada/ExtraHandler.h
branches/soc-2011-salad/source/blender/collada/LightExporter.cpp
branches/soc-2011-salad/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-salad/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-salad/source/blender/editors/animation/anim_deps.c
branches/soc-2011-salad/source/blender/editors/animation/anim_draw.c
branches/soc-2011-salad/source/blender/editors/animation/anim_filter.c
branches/soc-2011-salad/source/blender/editors/animation/anim_intern.h
branches/soc-2011-salad/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-salad/source/blender/editors/animation/anim_markers.c
branches/soc-2011-salad/source/blender/editors/animation/anim_ops.c
branches/soc-2011-salad/source/blender/editors/animation/drivers.c
branches/soc-2011-salad/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-salad/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-salad/source/blender/editors/animation/keyframes_edit.c
branches/soc-2011-salad/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-salad/source/blender/editors/animation/keyframing.c
branches/soc-2011-salad/source/blender/editors/animation/keyingsets.c
branches/soc-2011-salad/source/blender/editors/armature/armature_intern.h
branches/soc-2011-salad/source/blender/editors/armature/armature_ops.c
branches/soc-2011-salad/source/blender/editors/armature/editarmature.c
branches/soc-2011-salad/source/blender/editors/armature/poseSlide.c
branches/soc-2011-salad/source/blender/editors/armature/poseUtils.c
branches/soc-2011-salad/source/blender/editors/armature/poselib.c
branches/soc-2011-salad/source/blender/editors/armature/poseobject.c
branches/soc-2011-salad/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-salad/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_intern.h
branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_ops.c
branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-salad/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-salad/source/blender/editors/include/ED_gpencil.h
branches/soc-2011-salad/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2011-salad/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2011-salad/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-salad/source/blender/editors/include/ED_markers.h
branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
branches/soc-2011-salad/source/blender/editors/object/object_add.c
branches/soc-2011-salad/source/blender/editors/object/object_select.c
branches/soc-2011-salad/source/blender/editors/sound/sound_ops.c
branches/soc-2011-salad/source/blender/editors/space_action/action_draw.c
branches/soc-2011-salad/source/blender/editors/space_action/action_edit.c
branches/soc-2011-salad/source/blender/editors/space_action/action_intern.h
branches/soc-2011-salad/source/blender/editors/space_action/action_ops.c
branches/soc-2011-salad/source/blender/editors/space_action/action_select.c
branches/soc-2011-salad/source/blender/editors/space_action/space_action.c
branches/soc-2011-salad/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-salad/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_draw.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-salad/source/blender/editors/space_nla/nla_ops.c
branches/soc-2011-salad/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-salad/source/blender/editors/space_nla/space_nla.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-salad/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-salad/source/blender/editors/space_time/space_time.c
branches/soc-2011-salad/source/blender/editors/space_time/time_intern.h
branches/soc-2011-salad/source/blender/editors/space_time/time_ops.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-salad/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_anim_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_armature_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_nla_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_sound_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_animation_api.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_sound.c
branches/soc-2011-salad/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
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/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2011-salad/source/gameengine/Ketsji/KX_SoundActuator.cpp
Added Paths:
-----------
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
Property Changed:
----------------
branches/soc-2011-salad/
branches/soc-2011-salad/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39215
/branches/soc-2011-tomato:36831-39394
/trunk/blender:36834-39447
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39449
/branches/soc-2011-tomato:36831-39394
/trunk/blender:36834-39447
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -37,6 +37,10 @@
/**
* This factory creates an accumulator reader.
+ *
+ * The accumulator adds the difference at the input to the last output in case
+ * it's positive. In additive mode it additionaly adds the difference always.
+ * So in case the difference is positive, it's added twice.
*/
class AUD_AccumulatorFactory : public AUD_EffectFactory
{
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -97,11 +97,21 @@
void setLengths(int in, int out);
public:
+ /**
+ * Retrieves the last input samples.
+ * \param pos The position, valid are 0 (current) or negative values.
+ * \return The sample value.
+ */
inline sample_t x(int pos)
{
return m_x[(m_xpos + pos + m_xlen) % m_xlen * m_specs.channels + m_channel];
}
+ /**
+ * Retrieves the last output samples.
+ * \param pos The position, valid are negative values.
+ * \return The sample value.
+ */
inline sample_t y(int pos)
{
return m_y[(m_ypos + pos + m_ylen) % m_ylen * m_specs.channels + m_channel];
@@ -111,7 +121,16 @@
virtual void read(int& length, bool& eos, sample_t* buffer);
+ /**
+ * Runs the filtering function.
+ * \return The current output sample value.
+ */
virtual sample_t filter()=0;
+
+ /**
+ * Notifies the filter about a sample rate change.
+ * \param rate The new sample rate.
+ */
virtual void sampleRateChanged(AUD_SampleRate rate);
};
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_ButterworthFactory.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -35,7 +35,7 @@
#include "AUD_DynamicIIRFilterFactory.h"
/**
- * This factory creates a butterworth filter reader.
+ * This factory creates a butterworth lowpass filter reader.
*/
class AUD_ButterworthFactory : public AUD_DynamicIIRFilterFactory
{
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DelayReader.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -36,7 +36,7 @@
#include "AUD_Buffer.h"
/**
- * This class reads another reader and changes it's delay.
+ * This class reads another reader and delays it.
*/
class AUD_DelayReader : public AUD_EffectReader
{
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleFactory.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleFactory.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -36,7 +36,6 @@
/**
* This factory plays two other factories behind each other.
- * \note Readers from the underlying factories must have the same sample rate and channel count.
*/
class AUD_DoubleFactory : public AUD_IFactory
{
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.cpp 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.cpp 2011-08-16 14:38:46 UTC (rev 39450)
@@ -98,13 +98,13 @@
specs1 = m_reader1->getSpecs();
specs2 = m_reader2->getSpecs();
if(AUD_COMPARE_SPECS(specs1, specs2))
- length = len;
- else
{
int len2 = length - len;
m_reader2->read(len2, eos, buffer + specs1.channels * len);
length = len + len2;
}
+ else
+ length = len;
}
}
else
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DoubleReader.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -37,7 +37,7 @@
#include "AUD_Reference.h"
/**
- * This reader plays two readers with the same specs sequently.
+ * This reader plays two readers sequently.
*/
class AUD_DoubleReader : public AUD_IReader
{
@@ -57,21 +57,15 @@
*/
bool m_finished1;
- /**
- * The playback buffer for the intersecting part.
- */
- AUD_Buffer m_buffer;
-
// hide copy constructor and operator=
AUD_DoubleReader(const AUD_DoubleReader&);
AUD_DoubleReader& operator=(const AUD_DoubleReader&);
public:
/**
- * Creates a new ping pong reader.
+ * Creates a new double reader.
* \param reader1 The first reader to read from.
* \param reader2 The second reader to read from.
- * \exception AUD_Exception Thrown if the specs from the readers differ.
*/
AUD_DoubleReader(AUD_Reference<AUD_IReader> reader1, AUD_Reference<AUD_IReader> reader2);
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -34,13 +34,29 @@
#include "AUD_EffectFactory.h"
#include <vector>
+/**
+ * This factory creates a IIR filter reader.
+ *
+ * This means that on sample rate change the filter recalculates its
+ * coefficients.
+ */
class AUD_DynamicIIRFilterFactory : public AUD_EffectFactory
{
public:
+ /**
+ * Creates a new Dynmic IIR filter factory.
+ * \param factory The input factory.
+ */
AUD_DynamicIIRFilterFactory(AUD_Reference<AUD_IFactory> factory);
virtual AUD_Reference<AUD_IReader> createReader();
+ /**
+ * Recalculates the filter coefficients.
+ * \param rate The sample rate of the audio data.
+ * \param[out] b The input filter coefficients.
+ * \param[out] a The output filter coefficients.
+ */
virtual void recalculateCoefficients(AUD_SampleRate rate,
std::vector<float>& b,
std::vector<float>& a)=0;
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -34,6 +34,10 @@
#include "AUD_IIRFilterReader.h"
#include "AUD_DynamicIIRFilterFactory.h"
+/**
+ * This class is for dynamic infinite impulse response filters with simple
+ * coefficients that change depending on the sample rate.
+ */
class AUD_DynamicIIRFilterReader : public AUD_IIRFilterReader
{
private:
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_HighpassFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_HighpassFactory.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_HighpassFactory.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -41,7 +41,7 @@
{
private:
/**
- * The attack value in seconds.
+ * The cutoff frequency.
*/
const float m_frequency;
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_LimiterReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_LimiterReader.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_LimiterReader.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -35,7 +35,7 @@
#include "AUD_EffectReader.h"
/**
- * This reader limits another reader in start and end sample.
+ * This reader limits another reader in start and end times.
*/
class AUD_LimiterReader : public AUD_EffectReader
{
@@ -58,9 +58,9 @@
/**
* Creates a new limiter reader.
* \param reader The reader to read from.
- * \param start The desired start sample (inclusive).
- * \param end The desired end sample (exklusive), a negative value signals
- * that it should play to the end.
+ * \param start The desired start time (inclusive).
+ * \param end The desired end time (sample exklusive), a negative value
+ * signals that it should play to the end.
*/
AUD_LimiterReader(AUD_Reference<AUD_IReader> reader, float start = 0, float end = -1);
Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_LowpassFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_LowpassFactory.h 2011-08-16 14:11:58 UTC (rev 39449)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_LowpassFactory.h 2011-08-16 14:38:46 UTC (rev 39450)
@@ -41,7 +41,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list