[patch] trigger-0.5.2-freealut.patch

trigger-0.5.2-freealut.patch (text/plain), 1.14 KB, created by Tristan Heaven (RETIRED) on 2006-05-12 08:53:19 UTC

--- configure.ac
+++ configure.ac
@@ -98,11 +98,17 @@
 	*)
 	
 	AX_FINDLIB([AUDIOLIB], [OpenAL], [OpenAL],
-		AX_LANG_PROGRAM([#include <AL/alut.h>], [alutInit(0,0);]),
+		AX_LANG_PROGRAM([#include <AL/alc.h>], [alcOpenDevice(0);]),
 		[], [-lopenal],
 		[],
 		[AC_MSG_ERROR([Please install OpenAL])])
 	
+	AX_FINDLIB([AUDIOLIB], [ALUT], [ALUT],
+		AX_LANG_PROGRAM([#include <AL/alut.h>], [alutInit(0,0);]),
+		[], [-lalut],
+		[],
+		[AC_MSG_ERROR([Please install ALUT])])
+	
 	;;
 	
 esac

--- src/pengine/audio.cpp
+++ src/pengine/audio.cpp
@@ -196,25 +196,18 @@
 	PHYSFS_read(pfile, wavbuffer, filesize, 1);
 	PHYSFS_close(pfile);
 	
-	ALenum format;
-	ALvoid *data = null;
-	ALsizei size, freq;
-	ALboolean loop;
 	
-	alutLoadWAVMemory((ALbyte *)wavbuffer, &format, &data, &size, &freq, &loop);
+	buffer = alutCreateBufferFromFileImage(wavbuffer, filesize);
 	
 	delete [] wavbuffer;
 	
-	if (!data) {
+	if (buffer == AL_NONE) {
 		unload();
 		throw MakePException ("Sample load failed");
 	}
 	
-	alGenBuffers(1, &buffer);
 	
-	alBufferData(buffer, format, data, size, freq);
 	
-	alutUnloadWAV(format, data, size, freq);
 }
 
 void PAudioSample::unload()