[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51614] trunk/blender/intern/audaspace/ OpenAL/AUD_OpenALDevice.cpp: Audaspace:

[Joerg Mueller]

Revision: 51614
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51614
Author:   nexyon
Date:     2012-10-25 10:42:09 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
Audaspace:

OpenAL multichannel playback support fixed. This should fix bug [#31561] Audio only coming from Front Left in layout and bge.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp

Modified: trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2012-10-25 10:25:30 UTC (rev 51613)
+++ trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2012-10-25 10:42:09 UTC (rev 51614)
@@ -996,7 +996,6 @@
 {
 	// cannot determine how many channels or which format OpenAL uses, but
 	// it at least is able to play 16 bit stereo audio
-	specs.channels = AUD_CHANNELS_STEREO;
 	specs.format = AUD_FORMAT_S16;
 
 #if 0
@@ -1035,6 +1034,11 @@
 
 	m_useMC = alIsExtensionPresent("AL_EXT_MCFORMATS") == AL_TRUE;
 
+	if((!m_useMC && specs.channels > AUD_CHANNELS_STEREO) ||
+			specs.channels == AUD_CHANNELS_STEREO_LFE ||
+			specs.channels == AUD_CHANNELS_SURROUND5)
+		specs.channels = AUD_CHANNELS_STEREO;
+
 	alGetError();
 	alcGetError(m_device);