[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26041] trunk/blender/intern/audaspace/ OpenAL/AUD_OpenALDevice.cpp: Short term workaround for OpenAL + pulse bugs on ubuntu.

[Joerg Mueller]

Revision: 26041
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26041
Author:   nexyon
Date:     2010-01-16 23:12:19 +0100 (Sat, 16 Jan 2010)

Log Message:
-----------
Short term workaround for OpenAL + pulse bugs on ubuntu. Not sure if it works, people have to test and report please, I don't have ubuntu. Longer term we hope for an update of the ubuntu packages to fix the problem.

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	2010-01-16 22:03:26 UTC (rev 26040)
+++ trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2010-01-16 22:12:19 UTC (rev 26041)
@@ -270,8 +270,24 @@
 	specs.channels = AUD_CHANNELS_STEREO;
 	specs.format = AUD_FORMAT_S16;
 
-	m_device = alcOpenDevice(NULL);
+#if 0
+	if(alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT") == AL_TRUE)
+	{
+		ALCchar* devices = const_cast<ALCchar*>(alcGetString(NULL, ALC_DEVICE_SPECIFIER));
+		printf("OpenAL devices (standard is: %s):\n", alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER));
 
+		while(*devices)
+		{
+			printf("%s\n", devices);
+			devices += strlen(devices) + 1;
+		}
+	}
+#endif
+
+	m_device = alcOpenDevice("ALSA Software");
+	if(m_device == NULL)
+		m_device = alcOpenDevice(NULL);
+
 	if(!m_device)
 		AUD_THROW(AUD_ERROR_OPENAL);