diff --git a/3rdparty/OpenAL/include/alext.h b/3rdparty/OpenAL/include/alext.h index 7d2a95274a..4b9a155379 100644 --- a/3rdparty/OpenAL/include/alext.h +++ b/3rdparty/OpenAL/include/alext.h @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * Or go to http://www.gnu.org/copyleft/lgpl.html */ @@ -393,6 +393,72 @@ ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice *device); #endif #endif +#ifndef AL_EXT_BFORMAT +#define AL_EXT_BFORMAT 1 +#define AL_FORMAT_BFORMAT2D_8 0x20021 +#define AL_FORMAT_BFORMAT2D_16 0x20022 +#define AL_FORMAT_BFORMAT2D_FLOAT32 0x20023 +#define AL_FORMAT_BFORMAT3D_8 0x20031 +#define AL_FORMAT_BFORMAT3D_16 0x20032 +#define AL_FORMAT_BFORMAT3D_FLOAT32 0x20033 +#endif + +#ifndef AL_EXT_MULAW_BFORMAT +#define AL_EXT_MULAW_BFORMAT 1 +#define AL_FORMAT_BFORMAT2D_MULAW 0x10031 +#define AL_FORMAT_BFORMAT3D_MULAW 0x10032 +#endif + +#ifndef ALC_SOFT_HRTF +#define ALC_SOFT_HRTF 1 +#define ALC_HRTF_SOFT 0x1992 +#define ALC_DONT_CARE_SOFT 0x0002 +#define ALC_HRTF_STATUS_SOFT 0x1993 +#define ALC_HRTF_DISABLED_SOFT 0x0000 +#define ALC_HRTF_ENABLED_SOFT 0x0001 +#define ALC_HRTF_DENIED_SOFT 0x0002 +#define ALC_HRTF_REQUIRED_SOFT 0x0003 +#define ALC_HRTF_HEADPHONES_DETECTED_SOFT 0x0004 +#define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT 0x0005 +#define ALC_NUM_HRTF_SPECIFIERS_SOFT 0x1994 +#define ALC_HRTF_SPECIFIER_SOFT 0x1995 +#define ALC_HRTF_ID_SOFT 0x1996 +typedef const ALCchar* (ALC_APIENTRY*LPALCGETSTRINGISOFT)(ALCdevice *device, ALCenum paramName, ALCsizei index); +typedef ALCboolean (ALC_APIENTRY*LPALCRESETDEVICESOFT)(ALCdevice *device, const ALCint *attribs); +#ifdef AL_ALEXT_PROTOTYPES +ALC_API const ALCchar* ALC_APIENTRY alcGetStringiSOFT(ALCdevice *device, ALCenum paramName, ALCsizei index); +ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice *device, const ALCint *attribs); +#endif +#endif + +#ifndef AL_SOFT_gain_clamp_ex +#define AL_SOFT_gain_clamp_ex 1 +#define AL_GAIN_LIMIT_SOFT 0x200E +#endif + +#ifndef AL_SOFT_source_resampler +#define AL_SOFT_source_resampler +#define AL_NUM_RESAMPLERS_SOFT 0x1210 +#define AL_DEFAULT_RESAMPLER_SOFT 0x1211 +#define AL_SOURCE_RESAMPLER_SOFT 0x1212 +#define AL_RESAMPLER_NAME_SOFT 0x1213 +typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index); +#ifdef AL_ALEXT_PROTOTYPES +AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index); +#endif +#endif + +#ifndef AL_SOFT_source_spatialize +#define AL_SOFT_source_spatialize +#define AL_SOURCE_SPATIALIZE_SOFT 0x1214 +#define AL_AUTO_SOFT 0x0002 +#endif + +#ifndef ALC_SOFT_output_limiter +#define ALC_SOFT_output_limiter +#define ALC_OUTPUT_LIMITER_SOFT 0x199A +#endif + #ifdef __cplusplus } #endif diff --git a/3rdparty/OpenAL/include/efx-presets.h b/3rdparty/OpenAL/include/efx-presets.h index 86dcbda2f3..8539fd5178 100644 --- a/3rdparty/OpenAL/include/efx-presets.h +++ b/3rdparty/OpenAL/include/efx-presets.h @@ -345,7 +345,7 @@ typedef struct { /* Driving Presets */ #define EFX_REVERB_PRESET_DRIVING_COMMENTATOR \ - { 1.0000f, 0.0000f, 3.1623f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } + { 1.0000f, 0.0000f, 0.3162f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 } #define EFX_REVERB_PRESET_DRIVING_PITGARAGE \ { 0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 } diff --git a/3rdparty/OpenAL/libs/Win64/OpenAL32.def b/3rdparty/OpenAL/libs/Win64/OpenAL32.def index 6cd7ffaa00..810b8233c2 100644 --- a/3rdparty/OpenAL/libs/Win64/OpenAL32.def +++ b/3rdparty/OpenAL/libs/Win64/OpenAL32.def @@ -18,9 +18,6 @@ EXPORTS alDeleteBuffers alDeleteEffects alDeleteFilters - alDeleteFontsoundsSOFT - alDeletePresetsSOFT - alDeleteSoundfontsSOFT alDeleteSources alDisable alDistanceModel @@ -35,17 +32,10 @@ EXPORTS alFilterfv alFilteri alFilteriv - alFontsound2iSOFT - alFontsoundModulatoriSOFT - alFontsoundiSOFT - alFontsoundivSOFT alGenAuxiliaryEffectSlots alGenBuffers alGenEffects alGenFilters - alGenFontsoundsSOFT - alGenPresetsSOFT - alGenSoundfontsSOFT alGenSources alGetAuxiliaryEffectSlotf alGetAuxiliaryEffectSlotfv @@ -74,8 +64,6 @@ EXPORTS alGetFilteriv alGetFloat alGetFloatv - alGetFontsoundModulatorivSOFT - alGetFontsoundivSOFT alGetInteger alGetInteger64SOFT alGetInteger64vSOFT @@ -86,9 +74,7 @@ EXPORTS alGetListenerfv alGetListeneri alGetListeneriv - alGetPresetivSOFT alGetProcAddress - alGetSoundfontivSOFT alGetSource3dSOFT alGetSource3f alGetSource3i @@ -102,6 +88,7 @@ EXPORTS alGetSourcei64vSOFT alGetSourceiv alGetString + alGetStringiSOFT alIsAuxiliaryEffectSlot alIsBuffer alIsBufferFormatSupportedSOFT @@ -109,9 +96,6 @@ EXPORTS alIsEnabled alIsExtensionPresent alIsFilter - alIsFontsoundSOFT - alIsPresetSOFT - alIsSoundfontSOFT alIsSource alListener3f alListener3i @@ -119,21 +103,7 @@ EXPORTS alListenerfv alListeneri alListeneriv - alLoadSoundfontSOFT - alMidiEventSOFT - alMidiGainSOFT - alMidiPauseSOFT - alMidiPlaySOFT - alMidiResetSOFT - alMidiSoundfontSOFT - alMidiSoundfontvSOFT - alMidiStopSOFT - alMidiSysExSOFT - alPresetFontsoundsSOFT - alPresetiSOFT - alPresetivSOFT alProcessUpdatesSOFT - alSoundfontPresetsSOFT alSource3dSOFT alSource3f alSource3i @@ -175,7 +145,9 @@ EXPORTS alcGetIntegerv alcGetProcAddress alcGetString + alcGetStringiSOFT alcGetThreadContext + alcIsAmbisonicFormatSupportedSOFT alcIsExtensionPresent alcIsRenderFormatSupportedSOFT alcLoopbackOpenDeviceSOFT @@ -183,5 +155,6 @@ EXPORTS alcOpenDevice alcProcessContext alcRenderSamplesSOFT + alcResetDeviceSOFT alcSetThreadContext alcSuspendContext diff --git a/3rdparty/OpenAL/libs/Win64/OpenAL32.lib b/3rdparty/OpenAL/libs/Win64/OpenAL32.lib index 88dfed146a..7b21931172 100644 Binary files a/3rdparty/OpenAL/libs/Win64/OpenAL32.lib and b/3rdparty/OpenAL/libs/Win64/OpenAL32.lib differ diff --git a/bin/OpenAL32.dll b/bin/OpenAL32.dll index a718bdc5b5..75d46cf9b5 100644 Binary files a/bin/OpenAL32.dll and b/bin/OpenAL32.dll differ