From 96dd213e7ecabeffc682aee40b4102296ab062de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Mon, 3 Mar 2014 23:57:59 +0100 Subject: Audaspace: preparing to use standalone library. - Renamed some functions. - Using C API instead of C++ in the game engine, as the standalone is C++11. --- source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'source/gameengine/BlenderRoutines') diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 9b99574b790..f275d0a0f0c 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -102,8 +102,6 @@ typedef void * wmUIHandlerRemoveFunc; #ifdef WITH_AUDASPACE # include "AUD_C-API.h" -# include "AUD_I3DDevice.h" -# include "AUD_IDevice.h" #endif static BlendFileData *load_game_data(char *filename) @@ -502,13 +500,9 @@ 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_I3DDevice* dev = AUD_get3DDevice(); - if (dev) - { - dev->setSpeedOfSound(scene->audio.speed_of_sound); - dev->setDopplerFactor(scene->audio.doppler_factor); - dev->setDistanceModel(AUD_DistanceModel(scene->audio.distance_model)); - } + AUD_setSpeedOfSound(scene->audio.speed_of_sound); + AUD_setDopplerFactor(scene->audio.doppler_factor); + AUD_setDistanceModel(AUD_DistanceModel(scene->audio.distance_model)); // from see blender.c: // FIXME: this version patching should really be part of the file-reading code, @@ -675,7 +669,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c } // stop all remaining playing sounds - AUD_getDevice()->stopAll(); + AUD_stopAll(); } while (exitrequested == KX_EXIT_REQUEST_RESTART_GAME || exitrequested == KX_EXIT_REQUEST_START_OTHER_GAME); -- cgit v1.2.3