Finalize ALC_SOFT_reopen_device

4 files changed, 19 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index ca16818c..114b640e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 openal-soft-1.22.0:
 
-    Improved sound positioning when a source is near the listener.
+    Implemented the ALC_SOFT_reopen_device extension. This allows for moving
+    devices to different outputs without losing object state.
+
+    Implemented the legacy EAX extensions. Enabled by default only on Windows.
+
+    Improved sound positioning stability when a source is near the listener.
 
     Improved the default 5.1 output decoder.
 
@@ -17,12 +22,9 @@ openal-soft-1.22.0:
     Fixed WASAPI capture using really low sample rates, and sources with very
     high pitch shifts when using a bsinc resampler.
 
-    Implemented a PipeWire backend.
+    Added a PipeWire backend.
 
-    Implemented enumeration for the JACK and CoreAudio backends.
-
-    Implemented the legacy EAX extension APIs. Enabled by default only on
-    Windows.
+    Added enumeration for the JACK and CoreAudio backends.
 
     Added optional support for RTKit to get real-time priority. Only used as a
     backup when pthread_setschedparam fails.
@@ -39,9 +41,6 @@ openal-soft-1.22.0:
 
     Added an in-progress extension to select UHJ output in addition to HRTF.
 
-    Added an in-progress extension to reopen and move devices to different
-    outputs without losing object state.
-
     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 4579232b..b401162f 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -966,7 +966,7 @@ constexpr ALCchar alcExtensionList[] =
     "ALC_SOFT_output_limiter "
     "ALC_SOFTX_output_mode "
     "ALC_SOFT_pause_device "
-    "ALC_SOFTX_reopen_device";
+    "ALC_SOFT_reopen_device";
 constexpr int alcMajorVersion{1};
 constexpr int alcMinorVersion{1};
 
diff --git a/alc/inprogext.h b/alc/inprogext.h
index bf2a0849..ddebc79a 100644
--- a/alc/inprogext.h
+++ b/alc/inprogext.h
@@ -66,16 +66,6 @@ AL_API void AL_APIENTRY alAuxiliaryEffectSlotStopvSOFT(ALsizei n, const ALuint *
 #endif
 #endif
 
-#ifndef ALC_SOFT_reopen_device
-#define ALC_SOFT_reopen_device
-typedef ALCboolean (ALC_APIENTRY*LPALCREOPENDEVICESOFT)(ALCdevice *device,
-    const ALCchar *deviceName, const ALCint *attribs);
-#ifdef AL_ALEXT_PROTOTYPES
-ALCboolean ALC_APIENTRY alcReopenDeviceSOFT(ALCdevice *device, const ALCchar *deviceName,
-    const ALCint *attribs);
-#endif
-#endif
-
 #ifndef AL_SOFT_UHJ
 #define AL_SOFT_UHJ
 #define AL_FORMAT_UHJ2CHN8_SOFT                  0x19A2
diff --git a/include/AL/alext.h b/include/AL/alext.h
index f80b0708..6b21acaf 100644
--- a/include/AL/alext.h
+++ b/include/AL/alext.h
@@ -579,6 +579,16 @@ AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values);
 #endif
 #endif
 
+#ifndef ALC_SOFT_reopen_device
+#define ALC_SOFT_reopen_device
+typedef ALCboolean (ALC_APIENTRY*LPALCREOPENDEVICESOFT)(ALCdevice *device,
+    const ALCchar *deviceName, const ALCint *attribs);
+#ifdef AL_ALEXT_PROTOTYPES
+ALCboolean ALC_APIENTRY alcReopenDeviceSOFT(ALCdevice *device, const ALCchar *deviceName,
+    const ALCint *attribs);
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif