Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2011-06-22 00:24:40 +0400
committerJoerg Mueller <nexyon@gmail.com>2011-06-22 00:24:40 +0400
commitc89b4e4b665757e0a164e98985d2f5d1c6843fa0 (patch)
tree01a30699fae68e5639dfeb61467ef1ba113d5125 /source
parent044887b5a4b1df57fce408f29f59bce1d7fa0085 (diff)
3D Audio GSoC:
- Implemented a nice rechanneling solution with unofficial speaker arrangement standards similar to what OpenAL soft has - Renamend AUD_Channel in the C API to AUD_Handle - Removed the unlogical 7.2 speaker configuration, that's a hardware only config
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/sound.c2
-rw-r--r--source/gameengine/Ketsji/KX_SoundActuator.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 18eab716924..60a24c2eace 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -346,7 +346,7 @@ AUD_Device* sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start,
AUD_setDeviceVolume(mixdown, volume);
- AUD_freeChannel(AUD_playDevice(mixdown, scene->sound_scene, start / FPS));
+ AUD_freeHandle(AUD_playDevice(mixdown, scene->sound_scene, start / FPS));
return mixdown;
}
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h
index dc90d7d24de..9f145a71546 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.h
+++ b/source/gameengine/Ketsji/KX_SoundActuator.h
@@ -53,14 +53,14 @@ typedef struct KX_3DSoundSettings
class KX_SoundActuator : public SCA_IActuator
{
- Py_Header;
- bool m_isplaying;
+ Py_Header;
+ bool m_isplaying;
AUD_Sound* m_sound;
float m_volume;
float m_pitch;
bool m_is3d;
KX_3DSoundSettings m_3d;
- AUD_Channel* m_handle;
+ AUD_Handle* m_handle;
void play();