From edf78b077efa5a8d3f11ea2059095f33e9f971a8 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 17 Jun 2011 16:22:39 -0700
Subject: Use separate lines for HRTF history and values

---
 OpenAL32/Include/alMain.h   | 2 +-
 OpenAL32/Include/alSource.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenAL32/Include')

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index c77fa6eb..ab44fa55 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -497,7 +497,7 @@ ALboolean IsValidChannels(ALenum type);
 
 #define HRIR_BITS        (5)
 #define HRIR_LENGTH      (1<<HRIR_BITS)
-#define HRIR_LENGTH_MASK (HRIR_LENGTH-1)
+#define HRIR_MASK        (HRIR_LENGTH-1)
 void InitHrtf(void);
 void GetHrtfCoeffs(ALfloat elevation, ALfloat angle, const ALshort **left, const ALshort **right, ALuint *ldelay, ALuint *rdelay);
 
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index 0572cbc1..e9c50f14 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#define SRC_HISTORY_BITS   (7)
+#define SRC_HISTORY_BITS   (6)
 #define SRC_HISTORY_LENGTH (1<<SRC_HISTORY_BITS)
 #define SRC_HISTORY_MASK   (SRC_HISTORY_LENGTH-1)
 
@@ -94,7 +94,8 @@ typedef struct ALsource
     ALuint SampleSize;
 
     /* HRTF info */
-    ALfloat HrtfHistory[MAXCHANNELS][SRC_HISTORY_LENGTH][2];
+    ALfloat HrtfHistory[MAXCHANNELS][SRC_HISTORY_LENGTH];
+    ALfloat HrtfValues[MAXCHANNELS][HRIR_LENGTH][2];
     ALuint HrtfOffset;
 
     /* Current target parameters used for mixing */
-- 
cgit v1.2.3