diff options
| author | Kent Mein <mein@cs.umn.edu> | 2006-01-09 05:18:11 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2006-01-09 05:18:11 +0300 |
| commit | c693e01b8d9bd9af629b0fc8abab0a42a810c177 (patch) | |
| tree | 454029a54ec5ff4eb5138f9ccf8f04795b8c4a1c /intern/SoundSystem | |
| parent | 014aa7261e29810b35b3d65c759f9d255bf8a277 (diff) | |
Ton forgot a few modifications to the Scons and Makefile build systems.
These should make it so that other people can compile with OpenEXR support.
(I also added the OPENAL fix erwin commited to bf-blender since I
need it for my machine, and this syncs up the file)
Kent
Diffstat (limited to 'intern/SoundSystem')
| -rw-r--r-- | intern/SoundSystem/openal/SND_OpenALDevice.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index 2a320568e2a..28421b9f2e4 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -231,7 +231,7 @@ SND_OpenALDevice::SND_OpenALDevice() m_context = alcCreateContext(dev, NULL); if (m_context) { - alcMakeContextCurrent(m_context); + alcMakeContextCurrent((ALCcontext*)m_context); m_audio = true; m_device = dev; #ifdef __linux__ @@ -339,7 +339,7 @@ SND_OpenALDevice::~SND_OpenALDevice() if (m_context) { MakeCurrent(); - alcDestroyContext(m_context); + alcDestroyContext((ALCcontext*)m_context); m_context = NULL; } @@ -410,7 +410,7 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, waveslot->SetFileSize(size); /* what was (our) buffer? */ - int buffer = waveslot->GetBuffer(); + buffer = waveslot->GetBuffer(); /* get some info out of the sample */ SND_GetSampleInfo((signed char*)memlocation, waveslot); @@ -419,9 +419,9 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name, /* load the sample into openal */ #if defined(OUDE_OPENAL) || defined (__APPLE__) - alutLoadWAVMemory((char*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate); // openal_2.12 + alutLoadWAVMemory((ALbyte *)memlocation, &sampleformat, &data, &numberofsamples, &samplerate); // openal_2.12 #else - alutLoadWAVMemory((signed char*)memlocation, &sampleformat, &data, &numberofsamples, &samplerate, &loop);// openal_2.14+ + alutLoadWAVMemory((ALbyte *)memlocation, &sampleformat, &data, &numberofsamples, &samplerate, &loop);// openal_2.14+ #endif /* put it in the buffer */ alBufferData(m_buffers[buffer], sampleformat, data, numberofsamples, samplerate); |