[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22343] branches/blender2.5/blender: 2. 5 audio cleanup:
Jörg Müller
nexyon at gmail.com
Mon Aug 10 17:39:11 CEST 2009
Revision: 22343
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22343
Author: nexyon
Date: 2009-08-10 17:39:11 +0200 (Mon, 10 Aug 2009)
Log Message:
-----------
2.5 audio cleanup:
* Removed CD Actuator
* Removed bSample and bSoundListener
* Removed SoundSystem
* Removed -noaudio parameter
Modified Paths:
--------------
branches/blender2.5/blender/blenderplayer/CMakeLists.txt
branches/blender2.5/blender/intern/CMakeLists.txt
branches/blender2.5/blender/intern/Makefile
branches/blender2.5/blender/intern/SConscript
branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp
branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
branches/blender2.5/blender/release/scripts/textplugin_convert_ge.py
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
branches/blender2.5/blender/source/blender/editors/space_logic/logic_window.c
branches/blender2.5/blender/source/blender/editors/util/undo.c
branches/blender2.5/blender/source/blender/makesdna/DNA_actuator_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_sound_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_actuator.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_sound.c
branches/blender2.5/blender/source/blender/python/generic/Makefile
branches/blender2.5/blender/source/blender/python/intern/Makefile
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/intern/Makefile
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/blender2.5/blender/source/creator/CMakeLists.txt
branches/blender2.5/blender/source/creator/creator.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/blender2.5/blender/source/gameengine/Converter/Makefile
branches/blender2.5/blender/source/gameengine/Converter/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/common/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/common/windows/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SoundActuator.h
branches/blender2.5/blender/source/gameengine/Ketsji/Makefile
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Physics/Bullet/Makefile
branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
branches/blender2.5/blender/source/gameengine/Physics/common/Makefile
branches/blender2.5/blender/source/gameengine/PyDoc/GameLogic.py
branches/blender2.5/blender/source/gameengine/PyDoc/GameTypes.py
branches/blender2.5/blender/source/gameengine/VideoTexture/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/VideoTexture/Makefile
branches/blender2.5/blender/source/gameengine/VideoTexture/SConscript
branches/blender2.5/blender/source/kernel/gen_system/SYS_SingletonSystem.cpp
branches/blender2.5/blender/source/kernel/gen_system/SYS_SingletonSystem.h
branches/blender2.5/blender/source/nan_definitions.mk
Removed Paths:
-------------
branches/blender2.5/blender/intern/SoundSystem/
branches/blender2.5/blender/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_CDActuator.h
Modified: branches/blender2.5/blender/blenderplayer/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-08-10 15:39:11 UTC (rev 22343)
@@ -87,7 +87,6 @@
bf_scenegraph
bf_IK
bf_moto
- bf_soundsystem
bf_kernel
bf_nodes
bf_gpu
Modified: branches/blender2.5/blender/intern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/intern/CMakeLists.txt 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/intern/CMakeLists.txt 2009-08-10 15:39:11 UTC (rev 22343)
@@ -25,7 +25,6 @@
# ***** END GPL LICENSE BLOCK *****
ADD_SUBDIRECTORY(audaspace)
-ADD_SUBDIRECTORY(SoundSystem)
ADD_SUBDIRECTORY(string)
ADD_SUBDIRECTORY(ghost)
ADD_SUBDIRECTORY(guardedalloc)
Modified: branches/blender2.5/blender/intern/Makefile
===================================================================
--- branches/blender2.5/blender/intern/Makefile 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/intern/Makefile 2009-08-10 15:39:11 UTC (rev 22343)
@@ -32,7 +32,7 @@
# include nan_subdirs.mk
ALLDIRS = string ghost guardedalloc moto container memutil
-ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop smoke audaspace
+ALLDIRS += decimation iksolver bsp opennl elbeem boolop smoke audaspace
all::
@for i in $(ALLDIRS); do \
Modified: branches/blender2.5/blender/intern/SConscript
===================================================================
--- branches/blender2.5/blender/intern/SConscript 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/intern/SConscript 2009-08-10 15:39:11 UTC (rev 22343)
@@ -2,7 +2,6 @@
Import ('env')
SConscript(['audaspace/SConscript',
- 'SoundSystem/SConscript',
'string/SConscript',
'ghost/SConscript',
'guardedalloc/SConscript',
Modified: branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp 2009-08-10 15:39:11 UTC (rev 22343)
@@ -26,6 +26,8 @@
#include "AUD_SDLMixerFactory.h"
#include "AUD_SDLMixerReader.h"
+#include <cstring>
+
AUD_SDLMixerFactory::AUD_SDLMixerFactory(AUD_IReader* reader, AUD_Specs specs) :
AUD_MixerFactory(reader, specs) {}
Modified: branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp 2009-08-10 15:39:11 UTC (rev 22343)
@@ -26,6 +26,8 @@
#include "AUD_SDLMixerReader.h"
#include "AUD_Buffer.h"
+#include <cstring>
+
inline Uint16 AUD_TO_SDL(AUD_SampleFormat format)
{
// SDL only supports 8 and 16 bit audio
Modified: branches/blender2.5/blender/release/scripts/textplugin_convert_ge.py
===================================================================
--- branches/blender2.5/blender/release/scripts/textplugin_convert_ge.py 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/release/scripts/textplugin_convert_ge.py 2009-08-10 15:39:11 UTC (rev 22343)
@@ -537,7 +537,7 @@
'getFrameMessageCount': (replaceSimpleGetter, 'frameMessageCount'), # KX_NetworkMessageSensor
'getFrameProperty': (replaceSimpleGetter, 'framePropName'), # BL_ShapeActionActuator, BL_ActionActuator
'getFrequency': (replaceSimpleGetter, 'frequency'), # SCA_ISensor
- 'getGain': (replaceSimpleGetter, 'volume'), # KX_SoundActuator, KX_CDActuator
+ 'getGain': (replaceSimpleGetter, 'volume'), # KX_SoundActuator
'getHat': (replaceSimpleGetter, 'hat'), # SCA_JoystickSensor
'getHeight': (replaceSimpleGetter, 'height'), # KX_CameraActuator
'getHitNormal': (replaceSimpleGetter, 'hitNormal'), # KX_MouseFocusSensor, KX_RaySensor
@@ -620,7 +620,7 @@
'setFrame': (replaceSimpleSetter, 'frame'), # BL_ShapeActionActuator, BL_ActionActuator
'setFrameProperty': (replaceSimpleSetter, 'framePropName'), # BL_ShapeActionActuator, BL_ActionActuator
'setFrequency': (replaceSimpleSetter, 'frequency'), # SCA_ISensor
- 'setGain': (replaceSimpleSetter, 'volume'), # KX_SoundActuator, KX_CDActuator
+ 'setGain': (replaceSimpleSetter, 'volume'), # KX_SoundActuator
'setHeight': (replaceSimpleSetter, 'height'), # KX_CameraActuator
'setHold1': (replaceSimpleSetter, 'hold1'), # SCA_KeyboardSensor
'setHold2': (replaceSimpleSetter, 'hold2'), # SCA_KeyboardSensor
Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/source/Makefile 2009-08-10 15:39:11 UTC (rev 22343)
@@ -79,7 +79,6 @@
GRPLIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
GRPLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a
-GRPLIB += $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a
GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
@@ -353,67 +352,24 @@
# OpenAL libs are already compiled as shared code!
-# Some vars to keep the rest of this section mostly readable
-# in an 80 char term
-SOUNDSYSTEM = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
-DUMMYSOUND = $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
-OPENALSOUND = $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
-SDLSOUND = $(OCGDIR)/intern/SDLSoundSystem/$(DEBUG_DIR)libSDLSoundSystem.a
-
# Some kooky logic going on here ...
ifeq ($(NAN_NO_OPENAL), true)
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(SOUNDSYSTEM)
+# NAN_SND_LIBS =
else
ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc x86_64 parisc64"))
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(OPENALSOUND)
- NAN_SND_LIBS += $(SDLSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
- NAN_SND_LIBS += $(SOUNDSYSTEM)
else
ifeq ($(OS),windows)
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(OPENALSOUND)
- NAN_SND_LIBS += $(SDLSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
- NAN_SND_LIBS += $(SOUNDSYSTEM)
- else
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(SOUNDSYSTEM)
endif
endif
else
ifeq ($(OS),darwin)
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
- NAN_SND_LIBS += $(SOUNDSYSTEM)
else
ifeq ($(OS), solaris)
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(OPENALSOUND)
- NAN_SND_LIBS += $(SDLSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
- NAN_SND_LIBS += $(SOUNDSYSTEM)
- else
- ifeq ($(OS), irix)
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(SDLSOUND)
- NAN_SND_LIBS += $(SOUNDSYSTEM)
- else
- NAN_SND_LIBS = $(SOUNDSYSTEM)
- NAN_SND_LIBS += $(DUMMYSOUND)
- NAN_SND_LIBS += $(SOUNDSYSTEM)
- endif
endif
endif
endif
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h 2009-08-10 15:39:11 UTC (rev 22343)
@@ -44,7 +44,6 @@
/* forwards */
struct Main;
struct Object;
-struct bSoundListener;
struct BME_Glob;
typedef struct Global {
@@ -93,9 +92,6 @@
/* save the allowed windowstate of blender when using -W or -w */
int windowstate;
- /* Janco's playing ground */
- struct bSoundListener* listener;
-
/* ndof device found ? */
int ndofdevice;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c 2009-08-10 15:39:11 UTC (rev 22343)
@@ -434,9 +434,6 @@
sa->sound3D.cone_outer_angle = 360.0f;
sa->sound3D.max_distance = FLT_MAX;
break;
- case ACT_CD:
- act->data= MEM_callocN(sizeof(bCDActuator), "cdact");
- break;
case ACT_OBJECT:
act->data= MEM_callocN(sizeof(bObjectActuator), "objectact");
oa= act->data;
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-08-10 14:15:05 UTC (rev 22342)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-08-10 15:39:11 UTC (rev 22343)
@@ -3467,9 +3467,6 @@
bSoundActuator *sa= act->data;
sa->sound= newlibadr_us(fd, ob->id.lib, sa->sound);
}
- else if(act->type==ACT_CD) {
- /* bCDActuator *cda= act->data; */
- }
else if(act->type==ACT_GAME) {
/* bGameActuator *ga= act->data; */
}
@@ -5030,7 +5027,6 @@
static void direct_link_sound(FileData *fd, bSound *sound)
{
- sound->sample = NULL;
sound->snd_sound = NULL;
sound->packedfile = direct_link_packedfile(fd, sound->packedfile);
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list