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
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2012-10-25 14:42:09 +0400
committerJoerg Mueller <nexyon@gmail.com>2012-10-25 14:42:09 +0400
commit73f5944ebcbf87121a7d44e4c7fae87cfed79cef (patch)
treebce0cd1a6b2e0f578dd7c2481001f9a154620732 /intern/audaspace
parentad2dffe7c6255bd52dd25d2e530828bc0e493077 (diff)
Audaspace:
OpenAL multichannel playback support fixed. This should fix bug [#31561] Audio only coming from Front Left in layout and bge.
Diffstat (limited to 'intern/audaspace')
-rw-r--r--intern/audaspace/OpenAL/AUD_OpenALDevice.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
index c7d9612020b..12b6d2e4f38 100644
--- a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
+++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
@@ -996,7 +996,6 @@ AUD_OpenALDevice::AUD_OpenALDevice(AUD_DeviceSpecs specs, int buffersize)
{
// 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 @@ AUD_OpenALDevice::AUD_OpenALDevice(AUD_DeviceSpecs specs, int buffersize)
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);