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/blender/windowmanager | |
parent | cb9e51bf8a2b490c7e18dc88e8206b7a3ebd0038 (diff) |
2.5 audio cleanup:
* Removed CD Actuator
* Removed bSample and bSoundListener
* Removed SoundSystem
* Removed -noaudio parameter
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/Makefile | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 20 |
3 files changed, 2 insertions, 22 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 088bdc99687..69ebedbc684 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -33,7 +33,7 @@ SET(INC . ../include ../imbuf ../render/extern/include ../../../intern/bsp/extern ../radiosity/extern/include ../../../intern/decimation/extern ../blenloader - ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue + ../../kernel/gen_system ../readstreamglue ../quicktime ../../../intern/elbeem/extern ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../nodes diff --git a/source/blender/windowmanager/intern/Makefile b/source/blender/windowmanager/intern/Makefile index 8f0f47c52d0..823423cc28b 100644 --- a/source/blender/windowmanager/intern/Makefile +++ b/source/blender/windowmanager/intern/Makefile @@ -44,7 +44,7 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_GHOST)/include CPPFLAGS += -I$(NAN_ELBEEM)/include -CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include $(NAN_SDLCFLAGS) +CPPFLAGS += $(NAN_SDLCFLAGS) # modules CPPFLAGS += -I../../editors/include diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index e4e585a33b6..57e028670e7 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -38,7 +38,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_sound_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" @@ -92,16 +91,6 @@ #include "BKE_sound.h" -/* XXX */ -static void sound_init_listener(void) -{ - G.listener = MEM_callocN(sizeof(bSoundListener), "soundlistener"); - G.listener->gain = 1.0; - G.listener->dopplerfactor = 1.0; - G.listener->dopplervelocity = 340.29f; -} - - static void wm_init_reports(bContext *C) { BKE_reports_init(CTX_wm_reports(C), RPT_STORE); @@ -145,7 +134,6 @@ void WM_init(bContext *C) // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - sound_init_listener(); // init_node_butfuncs(); ED_preview_init_dbase(); @@ -220,10 +208,6 @@ void WM_exit(bContext *C) BKE_freecubetable(); -// if (G.background == 0) -// sound_end_all_sounds(); - - /* before free_blender so py's gc happens while library still exists */ /* needed at least for a rare sigsegv that can happen in pydrivers */ #ifndef DISABLE_PYTHON @@ -249,10 +233,6 @@ void WM_exit(bContext *C) // free_txt_data(); -// sound_exit_audio(); - if(G.listener) MEM_freeN(G.listener); - - libtiff_exit(); #ifdef WITH_QUICKTIME |