[Gemrb-commits] gemrb: branch master updated. v0.7.2-700-gcffeac5

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  cffeac524775d13a54fbe337da6aadef43c748ab (commit)
       via  2252aa9f69249d5548589bff7b5af46f0e415dac (commit)

Summary of changes:
 gemrb/plugins/OpenALAudio/OpenALAudio.cpp |   19 ++++++++++++++-----
 gemrb/plugins/OpenALAudio/OpenALAudio.h   |    2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)
      from  f17b4c159272dd61d5c984c2eee627c3020cac1b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=cffeac524775d13a54fbe337da6aadef43c748ab

commit cffeac524775d13a54fbe337da6aadef43c748ab
Author: Brad Allred <bra...@me...>
Date:   Mon Feb 11 17:10:38 2013 -0700

    OpenAL: add debug logging output to log the buffer properties when queuing

diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
index ba9796a..6b157a6 100644
--- a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
+++ b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
@@ -930,6 +930,15 @@ void OpenALAudioDriver::QueueBuffer(int stream, unsigned short bits,
 
 int OpenALAudioDriver::QueueALBuffer(ALuint source, ALuint buffer)
 {
+#ifdef _DEBUG
+	ALint frequency, bits, channels;
+	alGetBufferi(buffer, AL_FREQUENCY, &frequency);
+	alGetBufferi(buffer, AL_BITS, &bits);
+	alGetBufferi(buffer, AL_CHANNELS, &channels);
+	checkALError("Error querying buffer properties.", WARNING);
+	Log(DEBUG, "OpenAL", "Attempting to buffer audio source:%d\nFrequency:%d\nBits:%d\nChannels:%d",
+		source, frequency, bits, channels);
+#endif
 	ALint type;
 	alGetSourcei(source, AL_SOURCE_TYPE, &type);
 	if (type == AL_STATIC || checkALError("Cannot get AL source type.", ERROR)) {

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=2252aa9f69249d5548589bff7b5af46f0e415dac

commit 2252aa9f69249d5548589bff7b5af46f0e415dac
Author: Brad Allred <bra...@me...>
Date:   Mon Feb 11 17:10:03 2013 -0700

    OpenAL: we only allow one buffer queued at once so change this function to take ALuint instead of a pointer.

diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
index bf0d770..ba9796a 100644
--- a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
+++ b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
@@ -444,7 +444,7 @@ Holder<SoundHandle> OpenALAudioDriver::Play(const char* ResRef, int XPos, int YP
 	stream->Source = Source;
 	stream->free = false;
 
-	if (QueueALBuffer(Source, &Buffer) != GEM_OK) {
+	if (QueueALBuffer(Source, Buffer) != GEM_OK) {
 		return Holder<SoundHandle>();
 	}
 
@@ -699,7 +699,7 @@ int OpenALAudioDriver::QueueAmbient(int stream, const char* sound)
 
 	assert(!streams[stream].delete_buffers);
 
-	if (QueueALBuffer(source, &Buffer) != GEM_OK) {
+	if (QueueALBuffer(source, Buffer) != GEM_OK) {
 		return GEM_ERROR;
 	}
 
@@ -921,14 +921,14 @@ void OpenALAudioDriver::QueueBuffer(int stream, unsigned short bits,
 	streams[stream].delete_buffers = true;
 	streams[stream].ClearProcessedBuffers();
 
-	QueueALBuffer(streams[stream].Source, &Buffer);
+	QueueALBuffer(streams[stream].Source, Buffer);
 }
 
 // !!!!!!!!!!!!!!!
 // Private Methods
 // !!!!!!!!!!!!!!!
 
-int OpenALAudioDriver::QueueALBuffer(ALuint source, ALuint* buffer)
+int OpenALAudioDriver::QueueALBuffer(ALuint source, ALuint buffer)
 {
 	ALint type;
 	alGetSourcei(source, AL_SOURCE_TYPE, &type);
@@ -936,7 +936,7 @@ int OpenALAudioDriver::QueueALBuffer(ALuint source, ALuint* buffer)
 		Log(ERROR, "OpenAL", "Cannot queue a buffer to a static source.");
 		return GEM_ERROR;
 	}
-	alSourceQueueBuffers(source, 1, buffer);
+	alSourceQueueBuffers(source, 1, &buffer);
 	if (checkALError("Unable to queue buffer", ERROR)) {
 		return GEM_ERROR;
 	}
diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.h b/gemrb/plugins/OpenALAudio/OpenALAudio.h
index 7d83b94..90e5dd7 100644
--- a/gemrb/plugins/OpenALAudio/OpenALAudio.h
+++ b/gemrb/plugins/OpenALAudio/OpenALAudio.h
@@ -126,7 +126,7 @@ public:
 				int channels, short* memory,
 				int size, int samplerate);
 private:
-	int QueueALBuffer(ALuint source, ALuint* buffer);
+	int QueueALBuffer(ALuint source, ALuint buffer);
 
 private:
 	ALCcontext *alutContext;

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator