From 1cb29ece08cc6b43bb4b93e71d7139fc1cf8c919 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 26 Nov 2010 01:21:46 -0800
Subject: [PATCH] Make a FRACTIONONE macro, and use it

---
 Alc/ALu.c              |  8 ++++----
 Alc/mixer.c            | 16 ++++++++--------
 OpenAL32/Include/alu.h |  3 ++-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Alc/ALu.c b/Alc/ALu.c
index b7471132..9619f595 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -124,10 +124,10 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
     if(Pitch > (float)MAX_PITCH)
         ALSource->Params.Step = MAX_PITCH<<FRACTIONBITS;
     else if(!(Pitch > 0.0f))
-        ALSource->Params.Step = 1<<FRACTIONBITS;
+        ALSource->Params.Step = FRACTIONONE;
     else
     {
-        ALSource->Params.Step = Pitch*(1<<FRACTIONBITS);
+        ALSource->Params.Step = Pitch*FRACTIONONE;
         if(ALSource->Params.Step == 0)
             ALSource->Params.Step = 1;
     }
@@ -596,10 +596,10 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
     if(Pitch > (float)MAX_PITCH)
         ALSource->Params.Step = MAX_PITCH<<FRACTIONBITS;
     else if(!(Pitch > 0.0f))
-        ALSource->Params.Step = 1<<FRACTIONBITS;
+        ALSource->Params.Step = FRACTIONONE;
     else
     {
-        ALSource->Params.Step = Pitch*(1<<FRACTIONBITS);
+        ALSource->Params.Step = Pitch*FRACTIONONE;
         if(ALSource->Params.Step == 0)
             ALSource->Params.Step = 1;
     }
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 74af356d..9fae065e 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -40,26 +40,26 @@
 static __inline ALdouble point32(const ALfloat *vals, ALint step, ALint frac)
 { return vals[0]; (void)step; (void)frac; }
 static __inline ALdouble lerp32(const ALfloat *vals, ALint step, ALint frac)
-{ return lerp(vals[0], vals[step], frac * (1.0/(1<<FRACTIONBITS))); }
+{ return lerp(vals[0], vals[step], frac * (1.0/FRACTIONONE)); }
 static __inline ALdouble cubic32(const ALfloat *vals, ALint step, ALint frac)
 { return cubic(vals[-step], vals[0], vals[step], vals[step+step],
-               frac * (1.0/(1<<FRACTIONBITS))); }
+               frac * (1.0/FRACTIONONE)); }
 
 static __inline ALdouble point16(const ALshort *vals, ALint step, ALint frac)
 { return vals[0] / 32767.0; (void)step; (void)frac; }
 static __inline ALdouble lerp16(const ALshort *vals, ALint step, ALint frac)
-{ return lerp(vals[0], vals[step], frac * (1.0/(1<<FRACTIONBITS))) / 32767.0; }
+{ return lerp(vals[0], vals[step], frac * (1.0/FRACTIONONE)) / 32767.0; }
 static __inline ALdouble cubic16(const ALshort *vals, ALint step, ALint frac)
 { return cubic(vals[-step], vals[0], vals[step], vals[step+step],
-               frac * (1.0/(1<<FRACTIONBITS))) / 32767.0; }
+               frac * (1.0/FRACTIONONE)) / 32767.0; }
 
 static __inline ALdouble point8(const ALubyte *vals, ALint step, ALint frac)
 { return (vals[0]-128.0) / 127.0; (void)step; (void)frac; }
 static __inline ALdouble lerp8(const ALubyte *vals, ALint step, ALint frac)
-{ return (lerp(vals[0], vals[step], frac * (1.0/(1<<FRACTIONBITS)))-128.0) / 127.0; }
+{ return (lerp(vals[0], vals[step], frac * (1.0/FRACTIONONE))-128.0) / 127.0; }
 static __inline ALdouble cubic8(const ALubyte *vals, ALint step, ALint frac)
 { return (cubic(vals[-step], vals[0], vals[step], vals[step+step],
-                frac * (1.0/(1<<FRACTIONBITS)))-128.0) / 127.0; }
+                frac * (1.0/FRACTIONONE))-128.0) / 127.0; }
 
 
 #define DECL_TEMPLATE(T, sampler)                                             \
@@ -854,7 +854,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo)
         if(BufferSize == 0)
         {
             AL_PRINT("No samples to mix! Pitch too high (%u, %g)?\n",
-                     increment, increment/(double)(1<<FRACTIONBITS));
+                     increment, increment/(double)FRACTIONONE);
             State = AL_STOPPED;
             BufferListItem = Source->queue;
             BuffersPlayed = Source->BuffersInQueue;
@@ -864,7 +864,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo)
         }
 
         SrcData += BUFFER_PREPADDING*FrameSize;
-        switch((increment != (1<<FRACTIONBITS)) ? Source->Resampler : POINT_RESAMPLER)
+        switch((increment != FRACTIONONE) ? Source->Resampler : POINT_RESAMPLER)
         {
             case POINT_RESAMPLER:
                 if(Bytes == 4)
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index 4c05b733..05055bd1 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -78,7 +78,8 @@ typedef enum {
 #define BUFFERSIZE 8192
 
 #define FRACTIONBITS (14)
-#define FRACTIONMASK ((1<<FRACTIONBITS)-1)
+#define FRACTIONONE  (1<<FRACTIONBITS)
+#define FRACTIONMASK (FRACTIONONE-1)
 #define MAX_PITCH    (INT_MAX & ~FRACTIONMASK)
 
 /* NOTE: The AL_FORMAT_REAR* enums aren't handled here because they're
-- 
2.11.4.GIT