ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed deprecated alutLoadWAVFile() function.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
cosmosninja 2008-02-24 05:53:18 +00:00
parent 881e2cd6a9
commit b0338915c0
1 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/sfx_openal.cpp
View File

@ -58,53 +58,22 @@ void SFXImpl::play()
//-----------------------------------------------------------------------------
bool SFXImpl::load(const char* filename)
{
std::string path= loader->getPath(filename);
std::string path = loader->getPath(filename);
alGenBuffers(1, &m_soundBuffer);
if (alGetError() != AL_NO_ERROR)
{
fprintf(stderr, "Loading '%s' failed\n",filename);
return false;
}
ALenum format= 0;
ALsizei size= 0, freq= 0;
ALvoid* data= NULL;
ALboolean loop= AL_FALSE;
#ifdef __APPLE__
alutLoadWAVFile((ALbyte*)path.c_str(), &format, &data, &size, &freq);
#else
alutLoadWAVFile((ALbyte*)path.c_str(), &format, &data, &size, &freq, &loop);
#endif
if (data == NULL)
m_soundBuffer = alutCreateBufferFromFile( path.c_str() );
if( m_soundBuffer == AL_NONE )
{
fprintf(stderr, "Error 1 loading SFX: %s failed\n", path.c_str());
return false;
}
alBufferData(m_soundBuffer, format, data, size, freq);
alGenSources(1, &m_soundSource );
if (alGetError() != AL_NO_ERROR)
{
fprintf(stderr, "Error 2 loading SFX: %s failed\n", path.c_str());
return false;
}
alutUnloadWAV(format, data, size, freq);
if (alGetError() != AL_NO_ERROR)
{
fprintf(stderr, "Error 3 loading SFX: %s failed\n", path.c_str());
return false;
}
// Bind buffer with a source.
alGenSources(1, &m_soundSource);
if (alGetError() != AL_NO_ERROR)
{
fprintf(stderr, "Error 4 loading SFX: %s failed\n", path.c_str());
return false;
}
// not 3D yet
alSourcei (m_soundSource, AL_BUFFER, m_soundBuffer);
alSource3f(m_soundSource, AL_POSITION, 0.0, 0.0, 0.0);