* merge r22237 (from soundsystem branch) to have b25 still compile against new openal...
authorNathan Letwory <nathan@letworyinteractive.com>
Thu, 6 Aug 2009 08:04:35 +0000 (08:04 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Thu, 6 Aug 2009 08:04:35 +0000 (08:04 +0000)
  NOTE: Windows users should update lib/windows/openal from SVN.

intern/SoundSystem/openal/SND_OpenALDevice.cpp

index 424a05246aca44c77887daa2804a521a0f9ac332..480f4ff6d74089dc82798ada83f247081fd5d507 100644 (file)
@@ -372,9 +372,6 @@ SND_OpenALDevice::SND_OpenALDevice()
        {
 #ifdef __APPLE__
                ALenum alc_error = ALC_NO_ERROR;        // openal_2.12
-#elif defined(_WIN32)
-               // alcGetError has no arguments on windows
-               ALenum alc_error = alcGetError();       // openal_2.14+
 #else
                ALenum alc_error = alcGetError(NULL);   // openal_2.14+
 #endif
@@ -410,9 +407,6 @@ void SND_OpenALDevice::UseCD(void) const
 
 void SND_OpenALDevice::MakeCurrent() const
 {
-#ifdef WIN32
-       alcMakeContextCurrent(m_context);
-#endif
 }
 
 
@@ -614,11 +608,7 @@ void SND_OpenALDevice::InitListener()
        // have the same settings)
        float lispos[3] = {0,0,0};
        float lisvel[3] = {0,0,0};
-#ifdef WIN32
-       float lisori[6] = {0,1,0,0,0,1};
-#else
        float lisori[6] = {0,0,1,0,-1,0};
-#endif
 
        alListenerfv(AL_POSITION, lispos);
        alListenerfv(AL_VELOCITY, lisvel);