diff options
author | Jörg Müller <nexyon@gmail.com> | 2015-04-21 16:20:19 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2015-07-28 15:01:52 +0300 |
commit | f700c1f3a826ad7d2576822779f676a9b16fde7a (patch) | |
tree | 80ba565215d24aab36d1cc027a227845aca66fed /source | |
parent | 009bb9e5c9fb6542193e6a4250643420a7016726 (diff) |
Audaspace: name fixes and external library update.
Diffstat (limited to 'source')
4 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index a7346c8af67..db92e0ed3c9 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -182,7 +182,7 @@ void BKE_sound_init_once(void) static AUD_Device* sound_device; -void* sound_get_device(void) +void* BKE_sound_get_device(void) { return sound_device; } diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 93ef1fa8c46..7dfefb07184 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -505,7 +505,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c ketsjiengine->InitDome(scene->gm.dome.res, scene->gm.dome.mode, scene->gm.dome.angle, scene->gm.dome.resbuf, scene->gm.dome.tilt, scene->gm.dome.warptext); // initialize 3D Audio Settings - AUD_Device* device = sound_get_device(); + AUD_Device* device = BKE_sound_get_device(); AUD_Device_setSpeedOfSound(device, scene->audio.speed_of_sound); AUD_Device_setDopplerFactor(device, scene->audio.doppler_factor); AUD_Device_setDistanceModel(device, AUD_DistanceModel(scene->audio.distance_model)); @@ -675,7 +675,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c } // stop all remaining playing sounds - AUD_Device_stopAll(sound_get_device()); + AUD_Device_stopAll(BKE_sound_get_device()); } while (exitrequested == KX_EXIT_REQUEST_RESTART_GAME || exitrequested == KX_EXIT_REQUEST_START_OTHER_GAME); diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 75a301211a2..a0c314230f5 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -748,9 +748,10 @@ bool GPG_Application::startEngine(void) m_ketsjiengine->InitDome(m_startScene->gm.dome.res, m_startScene->gm.dome.mode, m_startScene->gm.dome.angle, m_startScene->gm.dome.resbuf, m_startScene->gm.dome.tilt, m_startScene->gm.dome.warptext); // initialize 3D Audio Settings - AUD_setSpeedOfSound(m_startScene->audio.speed_of_sound); - AUD_setDopplerFactor(m_startScene->audio.doppler_factor); - AUD_setDistanceModel(AUD_DistanceModel(m_startScene->audio.distance_model)); + AUD_Device* device = BKE_sound_get_device(); + AUD_Device_setSpeedOfSound(device, m_startScene->audio.speed_of_sound); + AUD_Device_setDopplerFactor(device, m_startScene->audio.doppler_factor); + AUD_Device_setDistanceModel(device, AUD_DistanceModel(m_startScene->audio.distance_model)); #ifdef WITH_PYTHON // Set the GameLogic.globalDict from marshal'd data, so we can diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp index 69821fc3fad..8f225e4d93b 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.cpp +++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp @@ -122,7 +122,7 @@ void KX_SoundActuator::play() break; } - //m_handle = AUD_Device_play(sound_get_device(), sound, false); + //m_handle = AUD_Device_play(BKE_sound_get_device(), sound, false); // in case of pingpong, we have to free the sound if(sound != m_sound) |