Fix ordering of alGetPointervSOFT

1 files changed, 28 insertions, 28 deletions

diff --git a/OpenAL32/alState.c b/OpenAL32/alState.c
index f34f385f..67f9aab7 100644
--- a/OpenAL32/alState.c
+++ b/OpenAL32/alState.c
@@ -427,7 +427,7 @@ AL_API void* AL_APIENTRY alGetPointerSOFT(ALenum pname)
     return value;
 }
 
-AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values)
+AL_API ALvoid AL_APIENTRY alGetBooleanv(ALenum pname, ALboolean *values)
 {
     ALCcontext *context;
 
@@ -435,9 +435,15 @@ AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values)
     {
         switch(pname)
         {
-            case AL_EVENT_CALLBACK_FUNCTION_SOFT:
-            case AL_EVENT_CALLBACK_USER_PARAM_SOFT:
-                values[0] = alGetPointerSOFT(pname);
+            case AL_DOPPLER_FACTOR:
+            case AL_DOPPLER_VELOCITY:
+            case AL_DISTANCE_MODEL:
+            case AL_SPEED_OF_SOUND:
+            case AL_DEFERRED_UPDATES_SOFT:
+            case AL_GAIN_LIMIT_SOFT:
+            case AL_NUM_RESAMPLERS_SOFT:
+            case AL_DEFAULT_RESAMPLER_SOFT:
+                values[0] = alGetBoolean(pname);
                 return;
         }
     }
@@ -450,13 +456,13 @@ AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values)
     switch(pname)
     {
     default:
-        alSetError(context, AL_INVALID_VALUE, 0, "Invalid pointer-vector property");
+        alSetError(context, AL_INVALID_VALUE, 0, "Invalid boolean-vector property");
     }
 
     ALCcontext_DecRef(context);
 }
 
-AL_API ALvoid AL_APIENTRY alGetBooleanv(ALenum pname, ALboolean *values)
+AL_API ALvoid AL_APIENTRY alGetDoublev(ALenum pname, ALdouble *values)
 {
     ALCcontext *context;
 
@@ -472,7 +478,7 @@ AL_API ALvoid AL_APIENTRY alGetBooleanv(ALenum pname, ALboolean *values)
             case AL_GAIN_LIMIT_SOFT:
             case AL_NUM_RESAMPLERS_SOFT:
             case AL_DEFAULT_RESAMPLER_SOFT:
-                values[0] = alGetBoolean(pname);
+                values[0] = alGetDouble(pname);
                 return;
         }
     }
@@ -485,13 +491,13 @@ AL_API ALvoid AL_APIENTRY alGetBooleanv(ALenum pname, ALboolean *values)
     switch(pname)
     {
     default:
-        alSetError(context, AL_INVALID_VALUE, 0, "Invalid boolean-vector property");
+        alSetError(context, AL_INVALID_VALUE, 0, "Invalid double-vector property");
     }
 
     ALCcontext_DecRef(context);
 }
 
-AL_API ALvoid AL_APIENTRY alGetDoublev(ALenum pname, ALdouble *values)
+AL_API ALvoid AL_APIENTRY alGetFloatv(ALenum pname, ALfloat *values)
 {
     ALCcontext *context;
 
@@ -507,7 +513,7 @@ AL_API ALvoid AL_APIENTRY alGetDoublev(ALenum pname, ALdouble *values)
             case AL_GAIN_LIMIT_SOFT:
             case AL_NUM_RESAMPLERS_SOFT:
             case AL_DEFAULT_RESAMPLER_SOFT:
-                values[0] = alGetDouble(pname);
+                values[0] = alGetFloat(pname);
                 return;
         }
     }
@@ -520,13 +526,13 @@ AL_API ALvoid AL_APIENTRY alGetDoublev(ALenum pname, ALdouble *values)
     switch(pname)
     {
     default:
-        alSetError(context, AL_INVALID_VALUE, 0, "Invalid double-vector property");
+        alSetError(context, AL_INVALID_VALUE, 0, "Invalid float-vector property");
     }
 
     ALCcontext_DecRef(context);
 }
 
-AL_API ALvoid AL_APIENTRY alGetFloatv(ALenum pname, ALfloat *values)
+AL_API ALvoid AL_APIENTRY alGetIntegerv(ALenum pname, ALint *values)
 {
     ALCcontext *context;
 
@@ -542,7 +548,7 @@ AL_API ALvoid AL_APIENTRY alGetFloatv(ALenum pname, ALfloat *values)
             case AL_GAIN_LIMIT_SOFT:
             case AL_NUM_RESAMPLERS_SOFT:
             case AL_DEFAULT_RESAMPLER_SOFT:
-                values[0] = alGetFloat(pname);
+                values[0] = alGetInteger(pname);
                 return;
         }
     }
@@ -555,13 +561,13 @@ AL_API ALvoid AL_APIENTRY alGetFloatv(ALenum pname, ALfloat *values)
     switch(pname)
     {
     default:
-        alSetError(context, AL_INVALID_VALUE, 0, "Invalid float-vector property");
+        alSetError(context, AL_INVALID_VALUE, 0, "Invalid integer-vector property");
     }
 
     ALCcontext_DecRef(context);
 }
 
-AL_API ALvoid AL_APIENTRY alGetIntegerv(ALenum pname, ALint *values)
+AL_API void AL_APIENTRY alGetInteger64vSOFT(ALenum pname, ALint64SOFT *values)
 {
     ALCcontext *context;
 
@@ -577,7 +583,7 @@ AL_API ALvoid AL_APIENTRY alGetIntegerv(ALenum pname, ALint *values)
             case AL_GAIN_LIMIT_SOFT:
             case AL_NUM_RESAMPLERS_SOFT:
             case AL_DEFAULT_RESAMPLER_SOFT:
-                values[0] = alGetInteger(pname);
+                values[0] = alGetInteger64SOFT(pname);
                 return;
         }
     }
@@ -590,13 +596,13 @@ AL_API ALvoid AL_APIENTRY alGetIntegerv(ALenum pname, ALint *values)
     switch(pname)
     {
     default:
-        alSetError(context, AL_INVALID_VALUE, 0, "Invalid integer-vector property");
+        alSetError(context, AL_INVALID_VALUE, 0, "Invalid integer64-vector property");
     }
 
     ALCcontext_DecRef(context);
 }
 
-AL_API void AL_APIENTRY alGetInteger64vSOFT(ALenum pname, ALint64SOFT *values)
+AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values)
 {
     ALCcontext *context;
 
@@ -604,15 +610,9 @@ AL_API void AL_APIENTRY alGetInteger64vSOFT(ALenum pname, ALint64SOFT *values)
     {
         switch(pname)
         {
-            case AL_DOPPLER_FACTOR:
-            case AL_DOPPLER_VELOCITY:
-            case AL_DISTANCE_MODEL:
-            case AL_SPEED_OF_SOUND:
-            case AL_DEFERRED_UPDATES_SOFT:
-            case AL_GAIN_LIMIT_SOFT:
-            case AL_NUM_RESAMPLERS_SOFT:
-            case AL_DEFAULT_RESAMPLER_SOFT:
-                values[0] = alGetInteger64SOFT(pname);
+            case AL_EVENT_CALLBACK_FUNCTION_SOFT:
+            case AL_EVENT_CALLBACK_USER_PARAM_SOFT:
+                values[0] = alGetPointerSOFT(pname);
                 return;
         }
     }
@@ -625,7 +625,7 @@ AL_API void AL_APIENTRY alGetInteger64vSOFT(ALenum pname, ALint64SOFT *values)
     switch(pname)
     {
     default:
-        alSetError(context, AL_INVALID_VALUE, 0, "Invalid integer64-vector property");
+        alSetError(context, AL_INVALID_VALUE, 0, "Invalid pointer-vector property");
     }
 
     ALCcontext_DecRef(context);