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:
authorErwin Coumans <blender@erwincoumans.com>2006-01-06 10:34:35 +0300
committerErwin Coumans <blender@erwincoumans.com>2006-01-06 10:34:35 +0300
commit32a64604bc31f3379b440abd694d9fcd18ede7f4 (patch)
tree961286ca2472e39c2993a9691224d2788dd8fae8 /intern
parentdd3356f694c882bc4bdec2a7c1b98154852d291c (diff)
openal didn't compile under linux, some casting problem.
Diffstat (limited to 'intern')
-rw-r--r--intern/SoundSystem/openal/SND_OpenALDevice.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
index 2a320568e2a..75dbd3ee33b 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;
}
@@ -421,7 +421,7 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name,
#if defined(OUDE_OPENAL) || defined (__APPLE__)
alutLoadWAVMemory((char*)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);