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/Ketsji | |
parent | cb9e51bf8a2b490c7e18dc88e8206b7a3ebd0038 (diff) |
2.5 audio cleanup:
* Removed CD Actuator
* Removed bSample and bSoundListener
* Removed SoundSystem
* Removed -noaudio parameter
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_CDActuator.cpp | 223 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_CDActuator.h | 97 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 61 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInitTypes.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SoundActuator.cpp | 3 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_SoundActuator.h | 13 | ||||
-rw-r--r-- | source/gameengine/Ketsji/Makefile | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 4 |
9 files changed, 10 insertions, 395 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index d368e9f4efd..b1d26b263a4 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -56,7 +56,6 @@ SET(INC ../../../source/gameengine/Physics/Sumo/Fuzzics/include ../../../source/gameengine/Network/LoopBackNetwork ../../../intern/audaspace - ../../../intern/SoundSystem ../../../source/blender/misc ../../../source/blender/blenloader ../../../source/blender/gpu diff --git a/source/gameengine/Ketsji/KX_CDActuator.cpp b/source/gameengine/Ketsji/KX_CDActuator.cpp deleted file mode 100644 index 27c33b68577..00000000000 --- a/source/gameengine/Ketsji/KX_CDActuator.cpp +++ /dev/null @@ -1,223 +0,0 @@ -/** - * KX_CDActuator.cpp - * - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - * - */ - -#include "KX_CDActuator.h" -#include "KX_GameObject.h" -#include <iostream> - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -/* ------------------------------------------------------------------------- */ -/* Native functions */ -/* ------------------------------------------------------------------------- */ -KX_CDActuator::KX_CDActuator(SCA_IObject* gameobject, - KX_CDACT_TYPE type, - int track, - short start, - short end) - : SCA_IActuator(gameobject) -{ - m_type = type; - m_track = track; - m_lastEvent = true; - m_isplaying = false; - m_startFrame = start; - m_endFrame = end; -} - - - -KX_CDActuator::~KX_CDActuator() -{ -} - - -/* hmmm, do we want this? */ -CValue* KX_CDActuator::GetReplica() -{ - KX_CDActuator* replica = new KX_CDActuator(*this); - replica->ProcessReplica(); - return replica; -}; - - - -bool KX_CDActuator::Update() -{ - bool result = false; - bool bNegativeEvent = IsNegativeEvent(); - - RemoveAllEvents(); - - if (!bNegativeEvent) - { - switch (m_type) - { - default: - // implement me !! - break; - } - } - return result; -} - - - -/* ------------------------------------------------------------------------- */ -/* Python functions */ -/* ------------------------------------------------------------------------- */ - - - -/* Integration hooks ------------------------------------------------------- */ -PyTypeObject KX_CDActuator::Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "KX_SoundActuator", - sizeof(PyObjectPlus_Proxy), - 0, - py_base_dealloc, - 0, - 0, - 0, - 0, - py_base_repr, - 0,0,0,0,0,0,0,0,0, - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, - 0,0,0,0,0,0,0, - Methods, - 0, - 0, - &SCA_IActuator::Type, - 0,0,0,0,0,0, - py_base_new -}; - -PyMethodDef KX_CDActuator::Methods[] = { - // Deprecated -----> - {"setGain",(PyCFunction) KX_CDActuator::sPySetGain,METH_VARARGS,NULL}, - {"getGain",(PyCFunction) KX_CDActuator::sPyGetGain,METH_VARARGS,NULL}, - // <----- - KX_PYMETHODTABLE_NOARGS(KX_CDActuator, startCD), - KX_PYMETHODTABLE_NOARGS(KX_CDActuator, pauseCD), - KX_PYMETHODTABLE_NOARGS(KX_CDActuator, resumeCD), - KX_PYMETHODTABLE_NOARGS(KX_CDActuator, stopCD), - KX_PYMETHODTABLE_NOARGS(KX_CDActuator, playAll), - KX_PYMETHODTABLE_O(KX_CDActuator, playTrack), - {NULL,NULL,NULL,NULL} //Sentinel -}; - -PyAttributeDef KX_CDActuator::Attributes[] = { - KX_PYATTRIBUTE_INT_RW("track", 1, 99, false, KX_CDActuator, m_track), - { NULL } //Sentinel -}; - -int KX_CDActuator::pyattr_setGain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef) -{ - KX_CDActuator* act = static_cast<KX_CDActuator*>(self); - return PY_SET_ATTR_SUCCESS; -} - -KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, startCD, -"startCD()\n" -"\tStarts the CD playing.\n") -{ - Py_RETURN_NONE; -} - - -KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, pauseCD, -"pauseCD()\n" -"\tPauses the CD playing.\n") -{ - Py_RETURN_NONE; -} - - -KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, resumeCD, -"resumeCD()\n" -"\tResumes the CD playing.\n") -{ - Py_RETURN_NONE; -} - - -KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, stopCD, -"stopCD()\n" -"\tStops the CD playing.\n") -{ - Py_RETURN_NONE; -} - - -KX_PYMETHODDEF_DOC_O(KX_CDActuator, playTrack, -"playTrack(trackNumber)\n" -"\tPlays the track selected.\n") -{ - if (PyLong_Check(value)) { - int track = PyLong_AsSsize_t(value); - } - Py_RETURN_NONE; -} - - - -KX_PYMETHODDEF_DOC_NOARGS(KX_CDActuator, playAll, -"playAll()\n" -"\tPlays the CD from the beginning.\n") -{ - Py_RETURN_NONE; -} - -// Deprecated -----> -PyObject* KX_CDActuator::PySetGain(PyObject* args) -{ - float gain = 1.0; - ShowDeprecationWarning("setGain()", "the volume property"); - if (!PyArg_ParseTuple(args, "f:setGain", &gain)) - return NULL; - - Py_RETURN_NONE; -} - - - -PyObject* KX_CDActuator::PyGetGain(PyObject* args) -{ - float gain = 1.0; - ShowDeprecationWarning("getGain()", "the volume property"); - PyObject* result = PyFloat_FromDouble(gain); - - return result; -} -// <----- diff --git a/source/gameengine/Ketsji/KX_CDActuator.h b/source/gameengine/Ketsji/KX_CDActuator.h deleted file mode 100644 index bce29adb6e8..00000000000 --- a/source/gameengine/Ketsji/KX_CDActuator.h +++ /dev/null @@ -1,97 +0,0 @@ -/** - * KX_CDActuator.h - * - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef __KX_CDACTUATOR -#define __KX_CDACTUATOR - -#include "SCA_IActuator.h" - -class KX_CDActuator : public SCA_IActuator -{ - Py_Header; - bool m_lastEvent; - bool m_isplaying; - /* just some handles to the audio-data... */ - int m_track; - short m_startFrame; - short m_endFrame; - -public: - enum KX_CDACT_TYPE - { - KX_CDACT_NODEF = 0, - KX_CDACT_PLAY_ALL, - KX_CDACT_PLAY_TRACK, - KX_CDACT_LOOP_TRACK, - KX_CDACT_VOLUME, - KX_CDACT_STOP, - KX_CDACT_PAUSE, - KX_CDACT_RESUME, - KX_SOUNDACT_MAX - }; - - KX_CDACT_TYPE m_type; - - KX_CDActuator(SCA_IObject* gameobject, - KX_CDACT_TYPE type, - int track, - short start, - short end); - - ~KX_CDActuator(); - - virtual bool Update(); - - CValue* GetReplica(); - - /* -------------------------------------------------------------------- */ - /* Python interface --------------------------------------------------- */ - /* -------------------------------------------------------------------- */ - - // Deprecated -----> - KX_PYMETHOD_VARARGS(KX_CDActuator,SetGain); - KX_PYMETHOD_VARARGS(KX_CDActuator,GetGain); - // <----- - - KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, startCD); - KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, pauseCD); - KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, resumeCD); - KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, stopCD); - KX_PYMETHOD_DOC_NOARGS(KX_CDActuator, playAll); - KX_PYMETHOD_DOC_O(KX_CDActuator, playTrack); - - static int pyattr_setGain(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef); - - -}; - -#endif //__KX_CDACTUATOR - diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index d8027a4d9fc..0eef33f927e 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -79,7 +79,6 @@ extern "C" { #include "ListValue.h" #include "InputParser.h" #include "KX_Scene.h" -#include "SND_DeviceManager.h" #include "NG_NetworkScene.h" //Needed for sendMessage() @@ -212,69 +211,21 @@ static bool usedsp = false; // this gets a pointer to an array filled with floats static PyObject* gPyGetSpectrum(PyObject*) { - SND_IAudioDevice* audiodevice = SND_DeviceManager::Instance(); - PyObject* resultlist = PyList_New(512); - if (audiodevice) - { - if (!usedsp) - { - audiodevice->StartUsingDSP(); - usedsp = true; - } - - float* spectrum = audiodevice->GetSpectrum(); - - for (int index = 0; index < 512; index++) - { - PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(spectrum[index])); - } - } - else { - for (int index = 0; index < 512; index++) - { - PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(0.0)); - } - } + for (int index = 0; index < 512; index++) + { + PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(0.0)); + } return resultlist; } -#if 0 // unused -static PyObject* gPyStartDSP(PyObject*, PyObject* args) -{ - SND_IAudioDevice* audiodevice = SND_DeviceManager::Instance(); - - if (!audiodevice) { - PyErr_SetString(PyExc_RuntimeError, "no audio device available"); - return NULL; - } - - if (!usedsp) { - audiodevice->StartUsingDSP(); - usedsp = true; - } - - Py_RETURN_NONE; -} -#endif - - static PyObject* gPyStopDSP(PyObject*, PyObject* args) { - SND_IAudioDevice* audiodevice = SND_DeviceManager::Instance(); - - if (!audiodevice) { - PyErr_SetString(PyExc_RuntimeError, "no audio device available"); - return NULL; - } - - if (usedsp) { - audiodevice->StopUsingDSP(); - usedsp = true; - } + PyErr_SetString(PyExc_RuntimeError, "no audio device available"); + return NULL; Py_RETURN_NONE; } diff --git a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp index 8ff0bfd5379..5260c0bb01a 100644 --- a/source/gameengine/Ketsji/KX_PythonInitTypes.cpp +++ b/source/gameengine/Ketsji/KX_PythonInitTypes.cpp @@ -36,7 +36,6 @@ #include "BL_BlenderShader.h" #include "BL_ShapeActionActuator.h" #include "KX_BlenderMaterial.h" -#include "KX_CDActuator.h" #include "KX_CameraActuator.h" #include "KX_ConstraintActuator.h" #include "KX_ConstraintWrapper.h" @@ -158,7 +157,6 @@ void initPyTypes(void) PyType_Ready_Attr(dict, CListValue, init_getset); PyType_Ready_Attr(dict, CValue, init_getset); PyType_Ready_Attr(dict, KX_BlenderMaterial, init_getset); - PyType_Ready_Attr(dict, KX_CDActuator, init_getset); PyType_Ready_Attr(dict, KX_Camera, init_getset); PyType_Ready_Attr(dict, KX_CameraActuator, init_getset); PyType_Ready_Attr(dict, KX_ConstraintActuator, init_getset); diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp index 510d359dc8e..024c51cabc1 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.cpp +++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp @@ -31,10 +31,7 @@ */ #include "KX_SoundActuator.h" -#include "SND_SoundObject.h" #include "KX_GameObject.h" -#include "SND_SoundObject.h" -#include "SND_Scene.h" // needed for replication #include "KX_PyMath.h" // needed for PyObjectFrom() #include <iostream> diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h index ddf8330072e..bc0293ed2b4 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.h +++ b/source/gameengine/Ketsji/KX_SoundActuator.h @@ -51,21 +51,14 @@ typedef struct KX_3DSoundSettings class KX_SoundActuator : public SCA_IActuator { - Py_Header; -// bool m_lastEvent; - bool m_isplaying; - /* just some handles to the audio-data... */ + Py_Header; + bool m_isplaying; AUD_Sound* m_sound; float m_volume; float m_pitch; bool m_is3d; KX_3DSoundSettings m_3d; - AUD_Handle* m_handle; -// class SND_SoundObject* m_soundObject; -// class SND_Scene* m_soundScene; -// short m_startFrame; -// short m_endFrame; -// bool m_pino; + AUD_Handle* m_handle; void play(); diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index 1c315350895..daa4c234076 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/source/gameengine/Ketsji/Makefile @@ -43,7 +43,6 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I../../blender/python CPPFLAGS += -I../../blender/python/generic CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_BULLET2)/include CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 373f1ca2606..ea4a538f86f 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -10,9 +10,7 @@ incs = '. #source/blender/python/generic' # Only for Mathutils! and bpy_internal incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc' incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' -incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal' -incs += ' #intern/audaspace' -incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter' +incs += ' #intern/audaspace #source/gameengine/Converter' incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include' incs += ' #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork #source/blender/blenlib' incs += ' #source/blender/blenkernel #source/blender #source/blender/editors/include' |