Finalize ALC_SOFT_output_mode

4 files changed, 21 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 773a2d04..c26f096d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,13 @@ openal-soft-1.22.0:
     Implemented the ALC_SOFT_reopen_device extension. This allows for moving
     devices to different outputs without losing object state.
 
+    Implemented the ALC_SOFT_output_mode extension.
+
     Implemented the AL_SOFT_callback_buffer extension.
 
+    Implemented the AL_SOFT_UHJ extension. This supports native UHJ buffer
+    formats and Super Stereo processing.
+
     Implemented the legacy EAX extensions. Enabled by default only on Windows.
 
     Improved sound positioning stability when a source is near the listener.
@@ -39,10 +44,6 @@ openal-soft-1.22.0:
     Added utilities to encode and decode UHJ audio files. Files are decoded to
     the .amb format, and are encoded from libsndfile-compatible formats.
 
-    Added an in-progress extension to handle UHJ audio buffers natively.
-
-    Added an in-progress extension to select UHJ output in addition to HRTF.
-
     Added an in-progress extension to hold sources in a playing state when a
     device disconnects. Allows devices to be reset or reopened and have sources
     resume from where they left off.
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 50cda827..3bbe43d0 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -967,7 +967,7 @@ constexpr ALCchar alcExtensionList[] =
     "ALC_SOFT_loopback "
     "ALC_SOFT_loopback_bformat "
     "ALC_SOFT_output_limiter "
-    "ALC_SOFTX_output_mode "
+    "ALC_SOFT_output_mode "
     "ALC_SOFT_pause_device "
     "ALC_SOFT_reopen_device";
 constexpr int alcMajorVersion{1};
diff --git a/alc/inprogext.h b/alc/inprogext.h
index 7dec7f81..9af80f12 100644
--- a/alc/inprogext.h
+++ b/alc/inprogext.h
@@ -54,21 +54,6 @@ AL_API void AL_APIENTRY alAuxiliaryEffectSlotStopvSOFT(ALsizei n, const ALuint *
 #define AL_STOP_SOURCES_ON_DISCONNECT_SOFT       0x19AB
 #endif
 
-#ifndef ALC_SOFT_output_mode
-#define ALC_SOFT_output_mode
-#define ALC_OUTPUT_MODE_SOFT                     0x19AC
-#define ALC_ANY_SOFT                             0x19AD
-/*#define ALC_MONO_SOFT                            0x1500*/
-/*#define ALC_STEREO_SOFT                          0x1501*/
-#define ALC_STEREO_BASIC_SOFT                    0x19AE
-#define ALC_STEREO_UHJ_SOFT                      0x19AF
-#define ALC_STEREO_HRTF_SOFT                     0x19B2
-/*#define ALC_QUAD_SOFT                            0x1503*/
-#define ALC_SURROUND_5_1_SOFT                    0x1504
-#define ALC_SURROUND_6_1_SOFT                    0x1505
-#define ALC_SURROUND_7_1_SOFT                    0x1506
-#endif
-
 
 /* Non-standard export. Not part of any extension. */
 AL_API const ALchar* AL_APIENTRY alsoft_get_version(void);
diff --git a/include/AL/alext.h b/include/AL/alext.h
index 7048302c..1757f341 100644
--- a/include/AL/alext.h
+++ b/include/AL/alext.h
@@ -624,6 +624,21 @@ AL_API void AL_APIENTRY alGetBufferPtrvSOFT(ALuint buffer, ALenum param, ALvoid
 #define AL_SUPER_STEREO_WIDTH_SOFT               0x19B1
 #endif
 
+#ifndef ALC_SOFT_output_mode
+#define ALC_SOFT_output_mode
+#define ALC_OUTPUT_MODE_SOFT                     0x19AC
+#define ALC_ANY_SOFT                             0x19AD
+/*#define ALC_MONO_SOFT                            0x1500*/
+/*#define ALC_STEREO_SOFT                          0x1501*/
+#define ALC_STEREO_BASIC_SOFT                    0x19AE
+#define ALC_STEREO_UHJ_SOFT                      0x19AF
+#define ALC_STEREO_HRTF_SOFT                     0x19B2
+/*#define ALC_QUAD_SOFT                            0x1503*/
+#define ALC_SURROUND_5_1_SOFT                    0x1504
+#define ALC_SURROUND_6_1_SOFT                    0x1505
+#define ALC_SURROUND_7_1_SOFT                    0x1506
+#endif
+
 #ifdef __cplusplus
 }
 #endif