Ton forgot a few modifications to the Scons and Makefile build systems.
[blender-staging.git] / intern / SoundSystem / openal / SND_OpenALDevice.cpp
index 2a320568e2a31ee725b6b4b860c9301d47e62b70..28421b9f2e4ee573532fb64c2fc0269abce8a0ac 100644 (file)
@@ -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);