[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38201] branches/soc-2011-salad: Merged soc-2011-pepper up to r38195 into salad.

Joerg Mueller nexyon at gmail.com
Thu Jul 7 21:10:57 CEST 2011 

Revision: 38201
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38201
Author:   nexyon
Date:     2011-07-07 19:10:57 +0000 (Thu, 07 Jul 2011)
Log Message:
-----------
Merged soc-2011-pepper up to r38195 into salad.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38195

Modified Paths:
--------------
    branches/soc-2011-salad/doc/python_api/rst/bge.types.rst
    branches/soc-2011-salad/intern/audaspace/CMakeLists.txt
    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_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_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/ffmpeg/AUD_FFMPEGReader.h
    branches/soc-2011-salad/intern/audaspace/fftw/AUD_BandPassReader.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_Buffer.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_Buffer.h
    branches/soc-2011-salad/intern/audaspace/intern/AUD_BufferReader.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_BufferReader.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.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_FileFactory.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_FileFactory.h
    branches/soc-2011-salad/intern/audaspace/intern/AUD_I3DDevice.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_IReader.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.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_Mixer.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_ReadDevice.cpp
    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_SilenceReader.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_SilenceReader.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_SinusReader.cpp
    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.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_StreamBufferFactory.h
    branches/soc-2011-salad/intern/audaspace/jack/AUD_JackDevice.cpp
    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/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/soc-2011-salad/release/datafiles/blenderbuttons
    branches/soc-2011-salad/release/datafiles/splash.png
    branches/soc-2011-salad/release/scripts/modules/bpy_types.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/presets/ffmpeg/DV.py
    branches/soc-2011-salad/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2011-salad/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2011-salad/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-salad/source/blender/blenfont/BLF_api.h
    branches/soc-2011-salad/source/blender/blenfont/intern/blf.c
    branches/soc-2011-salad/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_library.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_sound.h
    branches/soc-2011-salad/source/blender/blenkernel/intern/action.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/depsgraph.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/library.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/sound.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-salad/source/blender/blenloader/intern/writefile.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/ArmatureImporter.h
    branches/soc-2011-salad/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-salad/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-salad/source/blender/collada/DocumentImporter.h
    branches/soc-2011-salad/source/blender/collada/LightExporter.cpp
    branches/soc-2011-salad/source/blender/collada/SkinInfo.cpp
    branches/soc-2011-salad/source/blender/collada/TransformReader.cpp
    branches/soc-2011-salad/source/blender/collada/TransformWriter.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_filter.c
    branches/soc-2011-salad/source/blender/editors/animation/anim_ipo_utils.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/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/poselib.c
    branches/soc-2011-salad/source/blender/editors/armature/poseobject.c
    branches/soc-2011-salad/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2011-salad/source/blender/editors/include/ED_anim_api.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/UI_icons.h
    branches/soc-2011-salad/source/blender/editors/interface/interface.c
    branches/soc-2011-salad/source/blender/editors/interface/interface_anim.c
    branches/soc-2011-salad/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-salad/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-salad/source/blender/editors/interface/interface_style.c
    branches/soc-2011-salad/source/blender/editors/interface/interface_templates.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_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_graph/graph_edit.c
    branches/soc-2011-salad/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-salad/source/blender/editors/space_graph/graph_utils.c
    branches/soc-2011-salad/source/blender/editors/space_graph/space_graph.c
    branches/soc-2011-salad/source/blender/editors/space_logic/logic_window.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_select.c
    branches/soc-2011-salad/source/blender/editors/space_outliner/outliner.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_sequencer/sequencer_draw.c
    branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-salad/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-salad/source/blender/editors/space_time/space_time.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-salad/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-salad/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-salad/source/blender/makesdna/DNA_action_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-salad/source/blender/makesrna/RNA_access.h
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-salad/source/blender/windowmanager/intern/wm_files.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/BL_ArmatureObject.cpp
    branches/soc-2011-salad/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/soc-2011-salad/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2011-salad/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2011-salad/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/soc-2011-salad/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2011-salad/source/gameengine/Converter/BL_ShapeDeformer.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
    branches/soc-2011-salad/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2011-salad/source/gameengine/Ketsji/KX_SoundActuator.h

Added Paths:
-----------
    branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
    branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
    branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
    branches/soc-2011-salad/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
    branches/soc-2011-salad/intern/audaspace/intern/AUD_I3DHandle.h
    branches/soc-2011-salad/intern/audaspace/intern/AUD_IHandle.h
    branches/soc-2011-salad/intern/audaspace/intern/AUD_ReferenceHandler.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_ResampleReader.cpp
    branches/soc-2011-salad/intern/audaspace/intern/AUD_ResampleReader.h
    branches/soc-2011-salad/release/scripts/modules/mocap_constraints.py
    branches/soc-2011-salad/release/scripts/startup/ui_mocap.py

Removed Paths:
-------------
    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_ResampleFactory.h

Property Changed:
----------------
    branches/soc-2011-salad/


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-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-38039
/trunk/blender:36834-38193
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-38195
/branches/soc-2011-tomato:36831-38039
/trunk/blender:36834-38193

Modified: branches/soc-2011-salad/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2011-salad/doc/python_api/rst/bge.types.rst	2011-07-07 18:40:46 UTC (rev 38200)
+++ branches/soc-2011-salad/doc/python_api/rst/bge.types.rst	2011-07-07 19:10:57 UTC (rev 38201)
@@ -1539,6 +1539,49 @@
       Return the value matching key, or the default value if its not found.
       :return: The key value or a default.
 
+   .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0 blendin=0, play_mode=ACT_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0)
+
+      Plays an action.
+	  
+      :arg name: the name of the action
+	  :type name: string
+      :arg start: the start frame of the action
+	  :type start: float
+      :arg end: the end frame of the action
+	  :type end: float
+      :arg layer: the layer the action will play in (actions in different layers are added/blended together)
+	  :type layer: integer
+      :arg priority: only play this action if there isn't an action currently playing in this layer with a higher (lower number) priority
+	  :type priority: integer
+      :arg blendin: the amount of blending between this animation and the previous one on this layer
+	  :type blendin: float
+      :arg play_mode: the play mode
+	  :type play_mode: KX_ACTION_PLAY, KX_ACTION_LOOP, or KX_ACTION_PING_PONG
+      :arg layer_weight: how much of the previous layer to use for blending (0 = add)
+	  :type layer_weight: float
+      :arg ipo_flags: flags for the old IPO behaviors (force, etc)
+	  :type ipo_flags: int bitfield
+      :arg speed: the playback speed of the action as a factor (1.0 = normal speed, 2.0 = 2x speed, etc)
+	  :type speed: float
+
+   .. method:: getActionFrame(layer)
+   
+      Gets the current frame of the action playing in the supplied layer
+	  
+	  :arg layer: The layer that you want to get the frame from.
+	  :type layer: integer
+	  
+	  :return: The current frame of the action
+	  
+   .. method:: setActionFrame(layer, frame)
+   
+      Set the current frame of the action playing in the supplied layer
+	  
+	  :arg layer: The layer where you want to set the frame
+	  :type layer: integer
+	  :arg frame: The frame to set the action to
+	  :type frame: float
+
 .. class:: KX_IpoActuator(SCA_IActuator)
 
    IPO actuator activates an animation.

Modified: branches/soc-2011-salad/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/intern/audaspace/CMakeLists.txt	2011-07-07 18:40:46 UTC (rev 38200)
+++ branches/soc-2011-salad/intern/audaspace/CMakeLists.txt	2011-07-07 19:10:57 UTC (rev 38201)
@@ -41,6 +41,8 @@
 	FX/AUD_DelayReader.cpp
 	FX/AUD_DoubleFactory.cpp
 	FX/AUD_DoubleReader.cpp
+	FX/AUD_DynamicIIRFilterFactory.cpp
+	FX/AUD_DynamicIIRFilterReader.cpp
 	FX/AUD_EffectFactory.cpp
 	FX/AUD_EffectReader.cpp
 	FX/AUD_EnvelopeFactory.cpp
@@ -82,13 +84,13 @@
 	intern/AUD_ConverterFunctions.h
 	intern/AUD_ConverterReader.cpp
 	intern/AUD_ConverterReader.h
-	intern/AUD_DefaultMixer.cpp
-	intern/AUD_DefaultMixer.h
 	intern/AUD_FileFactory.cpp
 	intern/AUD_FileFactory.h
 	intern/AUD_I3DDevice.h
+	intern/AUD_I3DHandle.h
 	intern/AUD_IDevice.h
 	intern/AUD_IFactory.h
+	intern/AUD_IHandle.h
 	intern/AUD_IReader.h
 	intern/AUD_LinearResampleFactory.cpp
 	intern/AUD_LinearResampleFactory.h
@@ -104,7 +106,9 @@
 	intern/AUD_ReadDevice.cpp
 	intern/AUD_ReadDevice.h
 	intern/AUD_Reference.h
-	intern/AUD_ResampleFactory.h
+	intern/AUD_ReferenceHandler.cpp
+	intern/AUD_ResampleReader.cpp
+	intern/AUD_ResampleReader.h
 	intern/AUD_SequencerFactory.cpp
 	intern/AUD_SequencerFactory.h
 	intern/AUD_SequencerReader.cpp
@@ -131,6 +135,8 @@
 	FX/AUD_DelayReader.h
 	FX/AUD_DoubleFactory.h
 	FX/AUD_DoubleReader.h
+	FX/AUD_DynamicIIRFilterFactory.h
+	FX/AUD_DynamicIIRFilterReader.h
 	FX/AUD_EffectFactory.h
 	FX/AUD_EffectReader.h
 	FX/AUD_EnvelopeFactory.h

Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.cpp	2011-07-07 18:40:46 UTC (rev 38200)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.cpp	2011-07-07 19:10:57 UTC (rev 38201)
@@ -32,7 +32,7 @@
 #include "AUD_AccumulatorFactory.h"
 #include "AUD_CallbackIIRFilterReader.h"
 
-sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless)
+sample_t AUD_AccumulatorFactory::accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless)
 {
 	float in = reader->x(0);
 	float lastin = reader->x(-1);
@@ -42,7 +42,7 @@
 	return out;
 }
 
-sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless)
+sample_t AUD_AccumulatorFactory::accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless)
 {
 	float in = reader->x(0);
 	float lastin = reader->x(-1);
@@ -59,7 +59,7 @@
 {
 }
 
-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);

Modified: branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h	2011-07-07 18:40:46 UTC (rev 38200)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_AccumulatorFactory.h	2011-07-07 19:10:57 UTC (rev 38201)
@@ -33,6 +33,7 @@
 #define AUD_ACCUMULATORFACTORY
 
 #include "AUD_EffectFactory.h"
+class AUD_CallbackIIRFilterReader;
 
 /**
  * This factory creates an accumulator reader.
@@ -57,7 +58,10 @@
 	 */
 	AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory, bool additive = false);
 
-	virtual AUD_Reference<AUD_IReader> createReader() const;
+	virtual AUD_Reference<AUD_IReader> createReader();
+
+	static sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless);
+	static sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless);
 };
 
 #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-07-07 18:40:46 UTC (rev 38200)
+++ branches/soc-2011-salad/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp	2011-07-07 19:10:57 UTC (rev 38201)
@@ -33,20 +33,20 @@
 
 #include <cstring>
 
-#define CC m_channels + m_channel
+#define CC m_specs.channels + m_channel
 
 AUD_BaseIIRFilterReader::AUD_BaseIIRFilterReader(AUD_Reference<AUD_IReader> reader, int in,
 												 int out) :
 		AUD_EffectReader(reader),
-		m_channels(reader->getSpecs().channels),
+		m_specs(reader->getSpecs()),
 		m_xlen(in), m_ylen(out),
 		m_xpos(0), m_ypos(0), m_channel(0)
 {
-	m_x = new sample_t[in * m_channels];
-	m_y = new sample_t[out * m_channels];
+	m_x = new sample_t[m_xlen * m_specs.channels];
+	m_y = new sample_t[m_ylen * m_specs.channels];
 
-	memset(m_x, 0, sizeof(sample_t) * in * m_channels);
-	memset(m_y, 0, sizeof(sample_t) * out * m_channels);
+	memset(m_x, 0, sizeof(sample_t) * m_xlen * m_specs.channels);
+	memset(m_y, 0, sizeof(sample_t) * m_ylen * m_specs.channels);
 }
 
 AUD_BaseIIRFilterReader::~AUD_BaseIIRFilterReader()
@@ -55,24 +55,77 @@
 	delete[] m_y;
 }
 
-void AUD_BaseIIRFilterReader::read(int & length, sample_t* & buffer)
+void AUD_BaseIIRFilterReader::setLengths(int in, int out)
 {
-	sample_t* buf;
+	if(in != m_xlen)
+	{
+		sample_t* xn = new sample_t[in * m_specs.channels];
+		memset(xn, 0, sizeof(sample_t) * in * m_specs.channels);
 
-	int samplesize = AUD_SAMPLE_SIZE(m_reader->getSpecs());
+		for(m_channel = 0; m_channel < m_specs.channels; m_channel++)
+		{
+			for(int i = 1; i <= in && i <= m_xlen; i++)
+			{
+				xn[(in - i) * CC] = x(-i);
+			}
+		}
 
-	m_reader->read(length, buf);
+		delete[] m_x;
+		m_x = xn;
+		m_xpos = 0;
+		m_xlen = in;
+	}
 
-	if(m_buffer.getSize() < length * samplesize)
-		m_buffer.resize(length * samplesize);
+	if(out != m_ylen)
+	{
+		sample_t* yn = new sample_t[out * m_specs.channels];
+		memset(yn, 0, sizeof(sample_t) * out * m_specs.channels);
 
-	buffer = m_buffer.getBuffer();
+		for(m_channel = 0; m_channel < m_specs.channels; m_channel++)
+		{
+			for(int i = 1; i <= out && i <= m_ylen; i++)
+			{
+				yn[(out - i) * CC] = y(-i);
+			}
+		}
 
-	for(m_channel = 0; m_channel < m_channels; m_channel++)
+		delete[] m_y;
+		m_y = yn;
+		m_ypos = 0;
+		m_ylen = out;
+	}
+}
+
+void AUD_BaseIIRFilterReader::read(int& length, bool& eos, sample_t* buffer)
+{
+	AUD_Specs specs = m_reader->getSpecs();
+	if(specs.channels != m_specs.channels)
 	{
+		m_specs.channels = specs.channels;
+
+		delete[] m_x;
+		delete[] m_y;
+
+		m_x = new sample_t[m_xlen * m_specs.channels];
+		m_y = new sample_t[m_ylen * m_specs.channels];
+
+		memset(m_x, 0, sizeof(sample_t) * m_xlen * m_specs.channels);
+		memset(m_y, 0, sizeof(sample_t) * m_ylen * m_specs.channels);
+	}
+
+	if(specs.rate != m_specs.rate)
+	{
+		m_specs = specs;
+		sampleRateChanged(m_specs.rate);
+	}
+
+	m_reader->read(length, eos, buffer);
+
+	for(m_channel = 0; m_channel < m_specs.channels; m_channel++)
+	{
 		for(int i = 0; i < length; i++)
 		{
-			m_x[m_xpos * CC] = buf[i * CC];
+			m_x[m_xpos * CC] = buffer[i * CC];
 			m_y[m_ypos * CC] = buffer[i * CC] = filter();
 
 			m_xpos = (m_xpos + 1) % m_xlen;
@@ -80,3 +133,7 @@
 		}
 	}
 }
+
+void AUD_BaseIIRFilterReader::sampleRateChanged(AUD_SampleRate rate)
+{
+}


@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list