diff options
author | Michel Selten <michel@mselten.demon.nl> | 2003-07-16 22:23:50 +0400 |
---|---|---|
committer | Michel Selten <michel@mselten.demon.nl> | 2003-07-16 22:23:50 +0400 |
commit | 05cec8089346ce18a957487079668c2d8382a578 (patch) | |
tree | 38300512cc215e3d10ea226f043b74fc7df9f86d /intern/SoundSystem | |
parent | fbdc3ca860d9209a0ae5f2c012858db14dfff94a (diff) |
* Updated the auto* build system to compile again.
SoundSystem has been moved from source/gameengine to intern. This was needed
because functionality from SoundSystem was needed by
source/blender/src/editsound.c.
* Removed the option for the openal check in configure.ac. It's needed now by
SoundSystem
* Removed the functionality for checking if 'noaudio' was provied on the
commandline. Now audio is default on.
Diffstat (limited to 'intern/SoundSystem')
-rw-r--r-- | intern/SoundSystem/fmod/SND_FmodDevice.cpp | 12 | ||||
-rw-r--r-- | intern/SoundSystem/intern/SND_Scene.cpp | 8 | ||||
-rw-r--r-- | intern/SoundSystem/openal/SND_OpenALDevice.cpp | 13 |
3 files changed, 9 insertions, 24 deletions
diff --git a/intern/SoundSystem/fmod/SND_FmodDevice.cpp b/intern/SoundSystem/fmod/SND_FmodDevice.cpp index 6389971a1f6..06bcbc2f393 100644 --- a/intern/SoundSystem/fmod/SND_FmodDevice.cpp +++ b/intern/SoundSystem/fmod/SND_FmodDevice.cpp @@ -41,21 +41,15 @@ #include "SND_FmodDevice.h" #include "SoundDefines.h" -#include "SYS_System.h" #include "SND_Utils.h" SND_FmodDevice::SND_FmodDevice() { - // check if audio is wanted - SYS_SystemHandle syshandle = SYS_GetSystem(); - int audio = SYS_GetCommandLineInt(syshandle,"noaudio",0); - + /* Removed the functionality for checking if noaudio was provided on */ + /* the commandline. */ m_dspunit = NULL; - if (audio == 1) - m_audio = false; - else - m_audio = true; + m_audio = true; // let's check if we can get fmod to initialize... if (m_audio) diff --git a/intern/SoundSystem/intern/SND_Scene.cpp b/intern/SoundSystem/intern/SND_Scene.cpp index 4b59b17e458..8cb2052dc31 100644 --- a/intern/SoundSystem/intern/SND_Scene.cpp +++ b/intern/SoundSystem/intern/SND_Scene.cpp @@ -44,7 +44,6 @@ #include "SND_Scene.h" #include "SND_DependKludge.h" -#include "SYS_System.h" #include "SND_IAudioDevice.h" #include <stdlib.h> @@ -87,10 +86,9 @@ SND_Scene::~SND_Scene() // check if audioplayback is wanted bool SND_Scene::IsPlaybackWanted() { - SYS_SystemHandle syshandle = SYS_GetSystem(); - int audio = SYS_GetCommandLineInt(syshandle,"noaudio",0); - - if ((audio == 0) && m_audiodevice && m_wavecache) + /* Removed the functionality for checking if noaudio was provided on */ + /* the commandline. */ + if (m_audiodevice && m_wavecache) { m_audioplayback = true; } diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index b391680a922..7798a36ca1e 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -41,7 +41,6 @@ #include "SND_OpenALDevice.h" #include "SoundDefines.h" -#include "SYS_System.h" #include "SND_Utils.h" @@ -204,15 +203,9 @@ ALvoid alutUnloadWAV(ALenum format,ALvoid *data,ALsizei size,ALsizei freq) SND_OpenALDevice::SND_OpenALDevice() { - // check if audio is wanted - SYS_SystemHandle syshandle = SYS_GetSystem(); - int audio = SYS_GetCommandLineInt(syshandle,"noaudio",0); - - if (audio != 0) - m_audio = false; - else - m_audio = true; - + /* Removed the functionality for checking if noaudio was provided on */ + /* the commandline. */ + m_audio = true; m_context = NULL; m_buffersinitialized = false; m_sourcesinitialized = false; |