diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-03-24 12:09:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-03-24 12:09:10 +0300 |
commit | 688db0f25169a4270c2d7250a7eb200bf2ab0ae0 (patch) | |
tree | 2b44b83ff724c0b1de732698a42602a6751f769d /intern | |
parent | 5e44eba342190fe39332591a1e897a35658951c8 (diff) |
[#18260] FMOD Removal
from Jorg Muller (nexyon)
also removed references to CVS in install
Diffstat (limited to 'intern')
-rw-r--r-- | intern/SoundSystem/Makefile | 1 | ||||
-rw-r--r-- | intern/SoundSystem/SND_DependKludge.h | 3 | ||||
-rw-r--r-- | intern/SoundSystem/SoundDefines.h | 10 | ||||
-rw-r--r-- | intern/SoundSystem/dummy/SND_DummyDevice.cpp | 2 | ||||
-rw-r--r-- | intern/SoundSystem/intern/Makefile | 2 | ||||
-rw-r--r-- | intern/SoundSystem/intern/SND_DeviceManager.cpp | 15 | ||||
-rw-r--r-- | intern/SoundSystem/intern/SND_Scene.cpp | 23 | ||||
-rw-r--r-- | intern/SoundSystem/intern/SND_Utils.cpp | 32 | ||||
-rw-r--r-- | intern/SoundSystem/openal/SND_OpenALDevice.cpp | 2 |
9 files changed, 2 insertions, 88 deletions
diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index 051e2643a87..4e5a8363955 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/Makefile @@ -38,7 +38,6 @@ DIRS += dummy ifneq ($(NAN_NO_OPENAL),true) ifeq ($(OS),windows) - DIRS += fmod DIRS += openal sdl endif ifeq ($(OS),darwin) diff --git a/intern/SoundSystem/SND_DependKludge.h b/intern/SoundSystem/SND_DependKludge.h index 1a95f977abe..06d4ec9c0c9 100644 --- a/intern/SoundSystem/SND_DependKludge.h +++ b/intern/SoundSystem/SND_DependKludge.h @@ -43,9 +43,6 @@ # ifdef USE_OPENAL # undef USE_OPENAL # endif -# ifdef USE_FMOD -# undef USE_FMOD -# endif #endif #endif /* NO_SOUND */ diff --git a/intern/SoundSystem/SoundDefines.h b/intern/SoundSystem/SoundDefines.h index 450fde187b5..5238507c866 100644 --- a/intern/SoundSystem/SoundDefines.h +++ b/intern/SoundSystem/SoundDefines.h @@ -38,7 +38,6 @@ enum { snd_e_dummydevice = 0, - snd_e_fmoddevice, snd_e_openaldevice }; @@ -49,15 +48,6 @@ enum /* openal related stuff */ #define AL_LOOPING 0x1007 -/* fmod related stuff */ -#ifdef WIN32 -#define MIXRATE 22050 -#else -#define MIXRATE 44100 -#endif -#define NUM_FMOD_MIN_HW_CHANNELS 16 -#define NUM_FMOD_MAX_HW_CHANNELS 16 - /* activelist defines */ enum { diff --git a/intern/SoundSystem/dummy/SND_DummyDevice.cpp b/intern/SoundSystem/dummy/SND_DummyDevice.cpp index 3e5874f02ca..672c73e9c52 100644 --- a/intern/SoundSystem/dummy/SND_DummyDevice.cpp +++ b/intern/SoundSystem/dummy/SND_DummyDevice.cpp @@ -25,7 +25,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * SND_FmodDevice derived from SND_IAudioDevice + * SND_DummyDevice derived from SND_IAudioDevice */ #ifdef HAVE_CONFIG_H diff --git a/intern/SoundSystem/intern/Makefile b/intern/SoundSystem/intern/Makefile index c52be01f69f..7684b6b0bca 100644 --- a/intern/SoundSystem/intern/Makefile +++ b/intern/SoundSystem/intern/Makefile @@ -35,12 +35,10 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) -CPPFLAGS += -I$(NAN_FMOD)/include CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I../../../source/blender/include CPPFLAGS += -I../dummy -CPPFLAGS += -I../fmod CPPFLAGS += -I../openal CPPFLAGS += -I.. CPPFLAGS += -I. diff --git a/intern/SoundSystem/intern/SND_DeviceManager.cpp b/intern/SoundSystem/intern/SND_DeviceManager.cpp index 215c0f5b6fa..c4bc887dffe 100644 --- a/intern/SoundSystem/intern/SND_DeviceManager.cpp +++ b/intern/SoundSystem/intern/SND_DeviceManager.cpp @@ -38,9 +38,6 @@ #include "SND_DeviceManager.h" #include "SND_DependKludge.h" #include "SND_DummyDevice.h" -#ifdef USE_FMOD -#include "SND_FmodDevice.h" -#endif #ifdef USE_OPENAL #include "SND_OpenALDevice.h" #endif @@ -51,11 +48,7 @@ int SND_DeviceManager::m_subscriptions = 0; #ifdef USE_OPENAL int SND_DeviceManager::m_device_type = snd_e_openaldevice; #else -# ifdef USE_FMOD -int SND_DeviceManager::m_device_type = snd_e_fmoddevice; -# else int SND_DeviceManager::m_device_type = snd_e_dummydevice; -# endif #endif void SND_DeviceManager::Subscribe() @@ -115,14 +108,6 @@ void SND_DeviceManager::SetDeviceType(int device_type) // let's create the chosen device switch (device_type) { -#ifdef USE_FMOD - case snd_e_fmoddevice: - { - m_instance = new SND_FmodDevice(); - m_device_type = device_type; - break; - } -#endif #ifdef USE_OPENAL case snd_e_openaldevice: { diff --git a/intern/SoundSystem/intern/SND_Scene.cpp b/intern/SoundSystem/intern/SND_Scene.cpp index 9d050a81161..af1b43a08aa 100644 --- a/intern/SoundSystem/intern/SND_Scene.cpp +++ b/intern/SoundSystem/intern/SND_Scene.cpp @@ -217,14 +217,8 @@ void SND_Scene::UpdateListener() if (m_listener.IsModified()) { m_audiodevice->SetListenerGain(m_listener.GetGain()); - - // fmod doesn't support dopplervelocity, so just use the dopplerfactor instead -#ifdef USE_FMOD - m_audiodevice->SetDopplerFactor(m_listener.GetDopplerVelocity()); -#else m_audiodevice->SetDopplerVelocity(m_listener.GetDopplerVelocity()); m_audiodevice->SetDopplerFactor(m_listener.GetDopplerFactor()); -#endif m_listener.SetModified(false); } } @@ -304,23 +298,6 @@ void SND_Scene::UpdateActiveObects() if (id >= 0) { -#ifdef USE_FMOD - // fmod wants these set before playing the sample - if (pObject->IsModified()) - { - m_audiodevice->SetObjectLoop(id, pObject->GetLoopMode()); - m_audiodevice->SetObjectLoopPoints(id, pObject->GetLoopStart(), pObject->GetLoopEnd()); - } - - // ok, properties Set. now see if it must play - if (pObject->GetPlaystate() == SND_MUST_PLAY) - { - m_audiodevice->PlayObject(id); - pObject->SetPlaystate(SND_PLAYING); - pObject->InitRunning(); -// printf("start play: %d\n", tijd); - } -#endif if (pObject->Is3D()) { // Get the global positions and velocity vectors diff --git a/intern/SoundSystem/intern/SND_Utils.cpp b/intern/SoundSystem/intern/SND_Utils.cpp index 26ce106a24e..7890d2a3d63 100644 --- a/intern/SoundSystem/intern/SND_Utils.cpp +++ b/intern/SoundSystem/intern/SND_Utils.cpp @@ -158,39 +158,7 @@ bool SND_IsSampleValid(const STR_String& name, void* memlocation) if (shortbuf == SND_WAVE_FORMAT_PCM) result = true; - - /* only fmod supports compressed wav */ -#ifdef USE_FMOD - switch (shortbuf) - { - case SND_WAVE_FORMAT_ADPCM: - case SND_WAVE_FORMAT_ALAW: - case SND_WAVE_FORMAT_MULAW: - case SND_WAVE_FORMAT_DIALOGIC_OKI_ADPCM: - case SND_WAVE_FORMAT_CONTROL_RES_VQLPC: - case SND_WAVE_FORMAT_GSM_610: - case SND_WAVE_FORMAT_MPEG3: - result = true; - break; - default: - { - break; - } - } -#endif } -#ifdef USE_FMOD - /* only valid publishers may use ogg vorbis */ - else if (!memcmp(buffer, "OggS", 4)) - { - result = true; - } - /* only valid publishers may use mp3 */ - else if (((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "ÿû", 2)))) - { - result = true; - } -#endif } if (loadedsample) { diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index 9ce30f985ac..3649cf6de5a 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -316,7 +316,7 @@ SND_OpenALDevice::SND_OpenALDevice() void SND_OpenALDevice::UseCD(void) const { - // only fmod has CD support, so only create it here + // we use SDL for CD, so we create the system SND_CDObject::CreateSystem(); } |