diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 19:39:11 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 19:39:11 +0400 |
| commit | a27cc1adf0ef41ee71c9459df940c6fa3c578eea (patch) | |
| tree | 1415513cb30751799f654d7e4f0147e5e2601eaa /source/gameengine/Converter | |
| parent | cb9e51bf8a2b490c7e18dc88e8206b7a3ebd0038 (diff) | |
2.5 audio cleanup:
* Removed CD Actuator
* Removed bSample and bSoundListener
* Removed SoundSystem
* Removed -noaudio parameter
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertActuators.cpp | 39 | ||||
| -rw-r--r-- | source/gameengine/Converter/Makefile | 1 | ||||
| -rw-r--r-- | source/gameengine/Converter/SConscript | 4 |
4 files changed, 1 insertions, 48 deletions
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index f4aa50cd837..63e84899ec1 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -33,11 +33,6 @@ SET(INC ../../../intern/guardedalloc ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer ../../../intern/audaspace - ../../../intern/SoundSystem - ../../../intern/SoundSystem/include - ../../../intern/SoundSystem/openal - ../../../intern/SoundSystem/dummy - ../../../intern/SoundSystem/intern ../../../source/gameengine/Converter ../../../source/gameengine/BlenderRoutines ../../../source/blender/imbuf diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp index 1afadac5c0a..07f6f628e06 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.cpp +++ b/source/gameengine/Converter/KX_ConvertActuators.cpp @@ -50,7 +50,6 @@ #include "KX_SceneActuator.h" #include "KX_IpoActuator.h" #include "KX_SoundActuator.h" -#include "KX_CDActuator.h" #include "KX_ObjectActuator.h" #include "KX_TrackToActuator.h" #include "KX_ConstraintActuator.h" @@ -412,44 +411,6 @@ void BL_ConvertActuators(char* maggiename, } break; } - case ACT_CD: - { - bCDActuator* cdact = (bCDActuator*) bact->data; - /* get type, and possibly a start and end frame */ - short startFrame = cdact->sta, stopFrame = cdact->end; - KX_CDActuator::KX_CDACT_TYPE - cdActuatorType = KX_CDActuator::KX_CDACT_NODEF; - - switch(cdact->type) - { - case ACT_CD_PLAY_ALL: - cdActuatorType = KX_CDActuator::KX_CDACT_PLAY_ALL; - break; - case ACT_CD_PLAY_TRACK: - cdActuatorType = KX_CDActuator::KX_CDACT_PLAY_TRACK; - break; - case ACT_CD_LOOP_TRACK: - cdActuatorType = KX_CDActuator::KX_CDACT_LOOP_TRACK; - break; - case ACT_CD_VOLUME: - cdActuatorType = KX_CDActuator::KX_CDACT_VOLUME; - break; - case ACT_CD_STOP: - cdActuatorType = KX_CDActuator::KX_CDACT_STOP; - break; - case ACT_CD_PAUSE: - cdActuatorType = KX_CDActuator::KX_CDACT_PAUSE; - break; - case ACT_CD_RESUME: - cdActuatorType = KX_CDActuator::KX_CDACT_RESUME; - break; - - default: - /* This is an error!!! */ - cdActuatorType = KX_CDActuator::KX_CDACT_NODEF; - } - break; - } case ACT_PROPERTY: { bPropertyActuator* propact = (bPropertyActuator*) bact->data; diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile index 8a41207d73c..50bd851a1b0 100644 --- a/source/gameengine/Converter/Makefile +++ b/source/gameengine/Converter/Makefile @@ -37,7 +37,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_BULLET2)/include diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 1c03179ea07..04b53f2439e 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -6,9 +6,7 @@ defs = [] incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' -incs += ' #intern/audaspace' -incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal' -incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter' +incs += ' #intern/audaspace #source/gameengine/Converter' incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf' incs += ' #intern/moto/include #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork' incs += ' #source/blender/blenlib #source/blender/blenkernel #source/blender' |