[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22249] branches/blender2.5/blender/intern /SoundSystem/openal/SND_OpenALDevice.cpp: * merge r22237 ( from soundsystem branch) to have b25 still compile against new openal on windows.

[Nathan Letwory]

Revision: 22249
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22249
Author:   jesterking
Date:     2009-08-06 10:04:35 +0200 (Thu, 06 Aug 2009)

Log Message:
-----------
* merge r22237 (from soundsystem branch) to have b25 still compile against new openal on windows.
  NOTE: Windows users should update lib/windows/openal from SVN.

Modified Paths:
--------------
    branches/blender2.5/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp

Modified: branches/blender2.5/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
===================================================================
--- branches/blender2.5/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2009-08-06 05:06:55 UTC (rev 22248)
+++ branches/blender2.5/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2009-08-06 08:04:35 UTC (rev 22249)
@@ -372,9 +372,6 @@
 	{
 #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::MakeCurrent() const
 {
-#ifdef WIN32
-	alcMakeContextCurrent(m_context);
-#endif
 }
 
 
@@ -614,11 +608,7 @@
 	// 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);