Append _SOFT to the AL_SOFT_buffer_samples enums

2 files changed, 65 insertions, 65 deletions

diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h
index cacaa716..6802ab7b 100644
--- a/OpenAL32/Include/alBuffer.h
+++ b/OpenAL32/Include/alBuffer.h
@@ -9,28 +9,28 @@ extern "C" {
 
 /* User formats */
 enum UserFmtType {
-    UserFmtByte   = AL_BYTE,
-    UserFmtUByte  = AL_UNSIGNED_BYTE,
-    UserFmtShort  = AL_SHORT,
-    UserFmtUShort = AL_UNSIGNED_SHORT,
-    UserFmtInt    = AL_INT,
-    UserFmtUInt   = AL_UNSIGNED_INT,
-    UserFmtFloat  = AL_FLOAT,
-    UserFmtDouble = AL_DOUBLE,
-    UserFmtMulaw  = AL_MULAW,
-    UserFmtAlaw   = AL_ALAW,
-    UserFmtIMA4   = AL_IMA4,
-    UserFmtByte3  = AL_BYTE3,
-    UserFmtUByte3 = AL_UNSIGNED_BYTE3,
+    UserFmtByte   = AL_BYTE_SOFT,
+    UserFmtUByte  = AL_UNSIGNED_BYTE_SOFT,
+    UserFmtShort  = AL_SHORT_SOFT,
+    UserFmtUShort = AL_UNSIGNED_SHORT_SOFT,
+    UserFmtInt    = AL_INT_SOFT,
+    UserFmtUInt   = AL_UNSIGNED_INT_SOFT,
+    UserFmtFloat  = AL_FLOAT_SOFT,
+    UserFmtDouble = AL_DOUBLE_SOFT,
+    UserFmtByte3  = AL_BYTE3_SOFT,
+    UserFmtUByte3 = AL_UNSIGNED_BYTE3_SOFT,
+    UserFmtMulaw  = AL_MULAW_SOFT,
+    UserFmtAlaw   = AL_ALAW_SOFT,
+    UserFmtIMA4   = AL_IMA4_SOFT,
 };
 enum UserFmtChannels {
-    UserFmtMono   = AL_MONO,
-    UserFmtStereo = AL_STEREO,
-    UserFmtRear   = AL_REAR,
-    UserFmtQuad   = AL_QUAD,
-    UserFmtX51    = AL_5POINT1, /* (WFX order) */
-    UserFmtX61    = AL_6POINT1, /* (WFX order) */
-    UserFmtX71    = AL_7POINT1  /* (WFX order) */
+    UserFmtMono   = AL_MONO_SOFT,
+    UserFmtStereo = AL_STEREO_SOFT,
+    UserFmtRear   = AL_REAR_SOFT,
+    UserFmtQuad   = AL_QUAD_SOFT,
+    UserFmtX51    = AL_5POINT1_SOFT, /* (WFX order) */
+    UserFmtX61    = AL_6POINT1_SOFT, /* (WFX order) */
+    UserFmtX71    = AL_7POINT1_SOFT, /* (WFX order) */
 };
 
 ALuint BytesFromUserFmt(enum UserFmtType type);
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 3cc82617..27951e90 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -52,57 +52,57 @@ ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffe
 #ifndef AL_SOFT_buffer_samples
 #define AL_SOFT_buffer_samples 1
 /* Sample types */
-#define AL_BYTE                                  0x1400
-#define AL_UNSIGNED_BYTE                         0x1401
-#define AL_SHORT                                 0x1402
-#define AL_UNSIGNED_SHORT                        0x1403
-#define AL_INT                                   0x1404
-#define AL_UNSIGNED_INT                          0x1405
-#define AL_FLOAT                                 0x1406
-#define AL_DOUBLE                                0x1407
-#define AL_BYTE3                                 0x1408
-#define AL_UNSIGNED_BYTE3                        0x1409
-#define AL_MULAW                                 0x1410
-#define AL_ALAW                                  0x1411
-#define AL_IMA4                                  0x1412
+#define AL_BYTE_SOFT                             0x1400
+#define AL_UNSIGNED_BYTE_SOFT                    0x1401
+#define AL_SHORT_SOFT                            0x1402
+#define AL_UNSIGNED_SHORT_SOFT                   0x1403
+#define AL_INT_SOFT                              0x1404
+#define AL_UNSIGNED_INT_SOFT                     0x1405
+#define AL_FLOAT_SOFT                            0x1406
+#define AL_DOUBLE_SOFT                           0x1407
+#define AL_BYTE3_SOFT                            0x1408
+#define AL_UNSIGNED_BYTE3_SOFT                   0x1409
+#define AL_MULAW_SOFT                            0x1410
+#define AL_ALAW_SOFT                             0x1411
+#define AL_IMA4_SOFT                             0x1412
 
 /* Channel configurations */
-#define AL_MONO                                  0x1500
-#define AL_STEREO                                0x1501
-#define AL_REAR                                  0x1502
-#define AL_QUAD                                  0x1503
-#define AL_5POINT1                               0x1504 /* (WFX order) */
-#define AL_6POINT1                               0x1505 /* (WFX order) */
-#define AL_7POINT1                               0x1506 /* (WFX order) */
+#define AL_MONO_SOFT                             0x1500
+#define AL_STEREO_SOFT                           0x1501
+#define AL_REAR_SOFT                             0x1502
+#define AL_QUAD_SOFT                             0x1503
+#define AL_5POINT1_SOFT                          0x1504
+#define AL_6POINT1_SOFT                          0x1505
+#define AL_7POINT1_SOFT                          0x1506
 
 /* Storage formats */
-#define AL_MONO8                                 0x1100
-#define AL_MONO16                                0x1101
-#define AL_MONO32F                               0x10010
-#define AL_STEREO8                               0x1102
-#define AL_STEREO16                              0x1103
-#define AL_STEREO32F                             0x10011
-#define AL_QUAD8                                 0x1204
-#define AL_QUAD16                                0x1205
-#define AL_QUAD32F                               0x1206
-#define AL_REAR8                                 0x1207
-#define AL_REAR16                                0x1208
-#define AL_REAR32F                               0x1209
-#define AL_5POINT1_8                             0x120A
-#define AL_5POINT1_16                            0x120B
-#define AL_5POINT1_32F                           0x120C
-#define AL_6POINT1_8                             0x120D
-#define AL_6POINT1_16                            0x120E
-#define AL_6POINT1_32F                           0x120F
-#define AL_7POINT1_8                             0x1210
-#define AL_7POINT1_16                            0x1211
-#define AL_7POINT1_32F                           0x1212
+#define AL_MONO8_SOFT                            0x1100
+#define AL_MONO16_SOFT                           0x1101
+#define AL_MONO32F_SOFT                          0x10010
+#define AL_STEREO8_SOFT                          0x1102
+#define AL_STEREO16_SOFT                         0x1103
+#define AL_STEREO32F_SOFT                        0x10011
+#define AL_QUAD8_SOFT                            0x1204
+#define AL_QUAD16_SOFT                           0x1205
+#define AL_QUAD32F_SOFT                          0x1206
+#define AL_REAR8_SOFT                            0x1207
+#define AL_REAR16_SOFT                           0x1208
+#define AL_REAR32F_SOFT                          0x1209
+#define AL_5POINT1_8_SOFT                        0x120A
+#define AL_5POINT1_16_SOFT                       0x120B
+#define AL_5POINT1_32F_SOFT                      0x120C
+#define AL_6POINT1_8_SOFT                        0x120D
+#define AL_6POINT1_16_SOFT                       0x120E
+#define AL_6POINT1_32F_SOFT                      0x120F
+#define AL_7POINT1_8_SOFT                        0x1210
+#define AL_7POINT1_16_SOFT                       0x1211
+#define AL_7POINT1_32F_SOFT                      0x1212
 
 /* Buffer attributes */
-#define AL_INTERNAL_FORMAT                       0x2008
-#define AL_BYTE_LENGTH                           0x2009
-#define AL_SAMPLE_LENGTH                         0x200A
-#define AL_SEC_LENGTH                            0x200B
+#define AL_INTERNAL_FORMAT_SOFT                  0x2008
+#define AL_BYTE_LENGTH_SOFT                      0x2009
+#define AL_SAMPLE_LENGTH_SOFT                    0x200A
+#define AL_SEC_LENGTH_SOFT                       0x200B
 
 typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*);
 typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*);