Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>2004-12-30 06:08:34 +0300
committerKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>2004-12-30 06:08:34 +0300
commitc635a0eeadf9520e53e07b821aed7de702323ffb (patch)
tree4b458a18916bd70149bd3fd3b2109d9102668797 /intern
parenta970419d0ea2a2c6a8ba8de6046782367d054b87 (diff)
Fix loading of non-packed sounds for Linux.
Diffstat (limited to 'intern')
-rw-r--r--intern/SoundSystem/openal/SND_OpenALDevice.cpp6
1 files changed, 1 insertions, 5 deletions
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);