Attachment #86763 for bug #133310

Lines 129-135 Link Here

(-)a/configure.ac (-1 / +8 lines)
129	AC_CHECK_HEADER(AL/al.h, AC_DEFINE(OPENAL_HEADER))	129	AC_CHECK_HEADER(AL/al.h, AC_DEFINE(OPENAL_HEADER))
130	AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal $soundlibs";AC_DEFINE(HAVE_LIBOPENAL))	130	AC_CHECK_LIB(openal, alGetError, soundlibs="-lopenal $soundlibs";AC_DEFINE(HAVE_LIBOPENAL))
131		131
132	if test "x$soundlibs" = "x" ; then	132	dnl ------------------------
		133	dnl Check freealut audio library (currently default)
		134	dnl ------------------------
		135	AC_CHECK_HEADER(AL/alut.h, AC_DEFINE(ALUT_HEADER))
		136	AC_CHECK_LIB(alut, alutGetError, soundlibs="-lalut $soundlibs";AC_DEFINE(HAVE_LIBALUT))
		137
		138
		139	if test "$soundlibs" != "-lalut -lopenal " ; then
133		140
134	dnl ------------------------	141	dnl ------------------------
135	dnl Check fmod audio library (if openal not present)	142	dnl Check fmod audio library (if openal not present)




	ALsizei
		format = AL_FORMAT_MONO16,
		size = 0,
		bits = 0,
		freq = 44100;
	ALboolean bits = 0;

	CString extension = realfile.mid(realfile.length() - 4);
	extension.toLower();

	{
		//the loading proc
		ALboolean (*alutLoadVorbis)(ALuint, ALvoid *, ALint) =
			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(VORBISFUNC);

		if(alutLoadVorbis == NULL)
		{

	{
		//the loading proc
		ALboolean (*alutLoadMP3)(ALuint, ALvoid *, ALint) =
			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(MP3FUNC);

		if(alutLoadMP3 == NULL)
		{

	else //default: load as wave file
	{
		alGenBuffers(1, &m_Buffer);
		alutLoadWAVFile((ALbyte *) realfile.c_str(), &format, &wave, &size, &freq, &bits);
		alBufferData(m_Buffer, format, wave, size, freq);
	}


Return to bug 133310

Lines 98-105 Link Here

(-)a/ultimatestunts/sndsample.cpp (-4 / +4 lines)
98	ALsizei	98	ALsizei
99	format = AL_FORMAT_MONO16,	99	format = AL_FORMAT_MONO16,
100	size = 0,	100	size = 0,
101	bits = 0,
102	freq = 44100;	101	freq = 44100;
		102	ALboolean bits = 0;
103		103
104	CString extension = realfile.mid(realfile.length() - 4);	104	CString extension = realfile.mid(realfile.length() - 4);
105	extension.toLower();	105	extension.toLower();
Lines 108-114 Link Here
108	{	108	{
109	//the loading proc	109	//the loading proc
110	ALboolean (alutLoadVorbis)(ALuint, ALvoid , ALint) =	110	ALboolean (alutLoadVorbis)(ALuint, ALvoid , ALint) =
111	(ALboolean ()(ALuint, ALvoid , ALint))alGetProcAddress((ALubyte *) VORBISFUNC);	111	(ALboolean ()(ALuint, ALvoid , ALint))alGetProcAddress(VORBISFUNC);
112		112
113	if(alutLoadVorbis == NULL)	113	if(alutLoadVorbis == NULL)
114	{	114	{
Lines 134-140 Link Here
134	{	134	{
135	//the loading proc	135	//the loading proc
136	ALboolean (alutLoadMP3)(ALuint, ALvoid , ALint) =	136	ALboolean (alutLoadMP3)(ALuint, ALvoid , ALint) =
137	(ALboolean ()(ALuint, ALvoid , ALint))alGetProcAddress((ALubyte *) MP3FUNC);	137	(ALboolean ()(ALuint, ALvoid , ALint))alGetProcAddress(MP3FUNC);
138		138
139	if(alutLoadMP3 == NULL)	139	if(alutLoadMP3 == NULL)
140	{	140	{
Lines 159-165 Link Here
159	else //default: load as wave file	159	else //default: load as wave file
160	{	160	{
161	alGenBuffers(1, &m_Buffer);	161	alGenBuffers(1, &m_Buffer);
162	alutLoadWAV(realfile.c_str(), &wave, &format, &size, &bits, &freq);	162	alutLoadWAVFile((ALbyte *) realfile.c_str(), &format, &wave, &size, &freq, &bits);
163	alBufferData(m_Buffer, format, wave, size, freq);	163	alBufferData(m_Buffer, format, wave, size, freq);
164	}	164	}
165		165