Move NextPowerOf2 to alMain.h

3 files changed, 18 insertions, 36 deletions

diff --git a/Alc/alcEcho.c b/Alc/alcEcho.c
index 359dfbba..66710cc4 100644
--- a/Alc/alcEcho.c
+++ b/Alc/alcEcho.c
@@ -53,24 +53,6 @@ typedef struct ALechoState {
     ALfloat history[2];
 } ALechoState;
 
-// Find the next power of 2.  Actually, this will return the input value if
-// it is already a power of 2.
-static ALuint NextPowerOf2(ALuint value)
-{
-    ALuint powerOf2 = 1;
-
-    if(value)
-    {
-        value--;
-        while(value)
-        {
-            value >>= 1;
-            powerOf2 <<= 1;
-        }
-    }
-    return powerOf2;
-}
-
 ALvoid EchoDestroy(ALeffectState *effect)
 {
     ALechoState *state = (ALechoState*)effect;
diff --git a/Alc/alcReverb.c b/Alc/alcReverb.c
index 202e20ae..8a5a1149 100644
--- a/Alc/alcReverb.c
+++ b/Alc/alcReverb.c
@@ -126,24 +126,6 @@ static const ALfloat DECO_MULTIPLIER = 2.0f;
 // the maximum early reflection and late reverb delays).
 static const ALfloat MASTER_LINE_LENGTH = 0.3f + 0.1f;
 
-// Find the next power of 2.  Actually, this will return the input value if
-// it is already a power of 2.
-static ALuint NextPowerOf2(ALuint value)
-{
-    ALuint powerOf2 = 1;
-
-    if(value)
-    {
-        value--;
-        while(value)
-        {
-            value >>= 1;
-            powerOf2 <<= 1;
-        }
-    }
-    return powerOf2;
-}
-
 static ALuint CalcLengths(ALuint length[13], ALuint frequency)
 {
     ALuint samples, totalLength, index;
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index c929b358..2bcecf05 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -164,6 +164,24 @@ static __inline void al_print(const char *fname, unsigned int line, const char *
 #define LOWPASSFREQCUTOFF          (5000)
 
 
+// Find the next power-of-2 for non-power-of-2 numbers.
+static __inline ALuint NextPowerOf2(ALuint value)
+{
+    ALuint powerOf2 = 1;
+
+    if(value)
+    {
+        value--;
+        while(value)
+        {
+            value >>= 1;
+            powerOf2 <<= 1;
+        }
+    }
+    return powerOf2;
+}
+
+
 typedef struct {
     ALCboolean (*OpenPlayback)(ALCdevice*, const ALCchar*);
     void (*ClosePlayback)(ALCdevice*);