From: Kester Maddock Date: Thu, 30 Dec 2004 03:08:34 +0000 (+0000) Subject: Fix loading of non-packed sounds for Linux. X-Git-Tag: v2.37~806 X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/commitdiff_plain/c635a0eeadf9520e53e07b821aed7de702323ffb?hp=a970419d0ea2a2c6a8ba8de6046782367d054b87 Fix loading of non-packed sounds for Linux. --- diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index a7f7b075efa..983ee0e7015 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -433,12 +433,8 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, { #ifdef __APPLE__ alutLoadWAVFile((signed char*)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate); -#elif defined(WIN32) - alutLoadWAVFile((signed char*)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate, &loop); #else - alutLoadWAV((char*)samplename.Ptr(), &data, - &sampleformat, &numberofsamples, - &samplerate, &frequency); + alutLoadWAVFile((signed char*)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate, &loop); #endif /* put it in the buffer */ alBufferData(m_buffers[buffer], sampleformat, data, numberofsamples, samplerate);