diff --git a/Resources/Common/OpenAL/HRTF/SADIE_D1-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_D1-44100.mhr new file mode 100644 index 0000000..cdb85e2 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_D1-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_D1-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_D1-48000.mhr new file mode 100644 index 0000000..5e33a2f Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_D1-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_D1-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_D1-InvertedY-44100.mhr new file mode 100644 index 0000000..509031f Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_D1-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_D1-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_D1-InvertedY-48000.mhr new file mode 100644 index 0000000..0d7df9b Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_D1-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_D2-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_D2-44100.mhr new file mode 100644 index 0000000..20890e6 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_D2-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_D2-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_D2-48000.mhr new file mode 100644 index 0000000..a3509cd Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_D2-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_D2-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_D2-InvertedY-44100.mhr new file mode 100644 index 0000000..ea7435b Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_D2-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_D2-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_D2-InvertedY-48000.mhr new file mode 100644 index 0000000..31ca636 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_D2-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H10-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H10-44100.mhr new file mode 100644 index 0000000..7d0c666 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H10-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H10-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H10-48000.mhr new file mode 100644 index 0000000..bad265b Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H10-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H10-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H10-InvertedY-44100.mhr new file mode 100644 index 0000000..4f7ecc1 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H10-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H10-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H10-InvertedY-48000.mhr new file mode 100644 index 0000000..ba71776 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H10-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H12-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H12-44100.mhr new file mode 100644 index 0000000..70c074b Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H12-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H12-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H12-48000.mhr new file mode 100644 index 0000000..d78bfff Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H12-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H12-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H12-InvertedY-44100.mhr new file mode 100644 index 0000000..c36cb52 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H12-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H12-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H12-InvertedY-48000.mhr new file mode 100644 index 0000000..1bd7dc5 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H12-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H13-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H13-44100.mhr new file mode 100644 index 0000000..fc60d61 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H13-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H13-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H13-48000.mhr new file mode 100644 index 0000000..0dca711 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H13-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H13-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H13-InvertedY-44100.mhr new file mode 100644 index 0000000..c4d09a2 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H13-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H13-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H13-InvertedY-48000.mhr new file mode 100644 index 0000000..4df51b7 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H13-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H14-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H14-44100.mhr new file mode 100644 index 0000000..596cccd Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H14-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H14-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H14-48000.mhr new file mode 100644 index 0000000..fae6e07 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H14-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H14-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H14-InvertedY-44100.mhr new file mode 100644 index 0000000..8842ac3 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H14-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H14-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H14-InvertedY-48000.mhr new file mode 100644 index 0000000..6b417a6 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H14-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H15-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H15-44100.mhr new file mode 100644 index 0000000..d273371 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H15-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H15-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H15-48000.mhr new file mode 100644 index 0000000..874025f Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H15-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H15-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H15-InvertedY-44100.mhr new file mode 100644 index 0000000..9df6cd1 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H15-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H15-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H15-InvertedY-48000.mhr new file mode 100644 index 0000000..cc93312 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H15-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H16-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H16-44100.mhr new file mode 100644 index 0000000..d94be33 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H16-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H16-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H16-48000.mhr new file mode 100644 index 0000000..d49d260 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H16-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H16-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H16-InvertedY-44100.mhr new file mode 100644 index 0000000..c549362 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H16-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H16-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H16-InvertedY-48000.mhr new file mode 100644 index 0000000..e750eaf Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H16-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H17-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H17-44100.mhr new file mode 100644 index 0000000..ce2faac Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H17-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H17-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H17-48000.mhr new file mode 100644 index 0000000..c52c3ab Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H17-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H17-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H17-InvertedY-44100.mhr new file mode 100644 index 0000000..23d5a83 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H17-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H17-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H17-InvertedY-48000.mhr new file mode 100644 index 0000000..96dcd3f Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H17-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H18-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H18-44100.mhr new file mode 100644 index 0000000..f66a2ca Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H18-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H18-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H18-48000.mhr new file mode 100644 index 0000000..b783011 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H18-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H18-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H18-InvertedY-44100.mhr new file mode 100644 index 0000000..ef56891 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H18-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H18-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H18-InvertedY-48000.mhr new file mode 100644 index 0000000..ebc40d7 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H18-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H3-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H3-44100.mhr new file mode 100644 index 0000000..e66e984 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H3-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H3-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H3-48000.mhr new file mode 100644 index 0000000..7a37765 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H3-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H3-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H3-InvertedY-44100.mhr new file mode 100644 index 0000000..f481c5d Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H3-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H3-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H3-InvertedY-48000.mhr new file mode 100644 index 0000000..40d8b6a Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H3-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H4-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H4-44100.mhr new file mode 100644 index 0000000..779cf7a Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H4-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H4-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H4-48000.mhr new file mode 100644 index 0000000..a6c6f0c Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H4-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H4-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H4-InvertedY-44100.mhr new file mode 100644 index 0000000..db88d7a Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H4-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H4-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H4-InvertedY-48000.mhr new file mode 100644 index 0000000..cb6c05a Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H4-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H5-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H5-44100.mhr new file mode 100644 index 0000000..b7ac7e9 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H5-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H5-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H5-48000.mhr new file mode 100644 index 0000000..9e56502 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H5-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H5-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H5-InvertedY-44100.mhr new file mode 100644 index 0000000..c85a6d2 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H5-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H5-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H5-InvertedY-48000.mhr new file mode 100644 index 0000000..3d7d066 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H5-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H6-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H6-44100.mhr new file mode 100644 index 0000000..5174d45 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H6-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H6-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H6-48000.mhr new file mode 100644 index 0000000..2b5cd2f Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H6-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H6-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H6-InvertedY-44100.mhr new file mode 100644 index 0000000..ef5de52 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H6-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H6-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H6-InvertedY-48000.mhr new file mode 100644 index 0000000..5b80629 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H6-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H7-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H7-44100.mhr new file mode 100644 index 0000000..e146606 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H7-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H7-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H7-48000.mhr new file mode 100644 index 0000000..da66457 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H7-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H7-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H7-InvertedY-44100.mhr new file mode 100644 index 0000000..761e11c Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H7-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H7-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H7-InvertedY-48000.mhr new file mode 100644 index 0000000..95e63f9 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H7-InvertedY-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H9-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H9-44100.mhr new file mode 100644 index 0000000..8cb61ca Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H9-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H9-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H9-48000.mhr new file mode 100644 index 0000000..dc6d914 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H9-48000.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H9-InvertedY-44100.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H9-InvertedY-44100.mhr new file mode 100644 index 0000000..58a2195 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H9-InvertedY-44100.mhr differ diff --git a/Resources/Common/OpenAL/HRTF/SADIE_H9-InvertedY-48000.mhr b/Resources/Common/OpenAL/HRTF/SADIE_H9-InvertedY-48000.mhr new file mode 100644 index 0000000..5592501 Binary files /dev/null and b/Resources/Common/OpenAL/HRTF/SADIE_H9-InvertedY-48000.mhr differ diff --git a/Resources/OpenALSoft/1.7.411/APPDATA/OpenAL/COPYING b/Resources/OpenALSoft/1.07.411/APPDATA/OpenAL/COPYING similarity index 100% rename from Resources/OpenALSoft/1.7.411/APPDATA/OpenAL/COPYING rename to Resources/OpenALSoft/1.07.411/APPDATA/OpenAL/COPYING diff --git a/Resources/OpenALSoft/1.7.411/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.07.411/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.7.411/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.07.411/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.7.411/APPDATA/OpenAL/openal-info.exe b/Resources/OpenALSoft/1.07.411/APPDATA/OpenAL/openal-info.exe similarity index 100% rename from Resources/OpenALSoft/1.7.411/APPDATA/OpenAL/openal-info.exe rename to Resources/OpenALSoft/1.07.411/APPDATA/OpenAL/openal-info.exe diff --git a/Resources/OpenALSoft/1.7.411/APPDATA/OpenAL/readme.txt b/Resources/OpenALSoft/1.07.411/APPDATA/OpenAL/readme.txt similarity index 100% rename from Resources/OpenALSoft/1.7.411/APPDATA/OpenAL/readme.txt rename to Resources/OpenALSoft/1.07.411/APPDATA/OpenAL/readme.txt diff --git a/Resources/OpenALSoft/1.8.466/APPDATA/OpenAL/COPYING b/Resources/OpenALSoft/1.08.466/APPDATA/OpenAL/COPYING similarity index 100% rename from Resources/OpenALSoft/1.8.466/APPDATA/OpenAL/COPYING rename to Resources/OpenALSoft/1.08.466/APPDATA/OpenAL/COPYING diff --git a/Resources/OpenALSoft/1.8.466/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.08.466/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.8.466/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.08.466/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.8.466/APPDATA/OpenAL/openal-info.exe b/Resources/OpenALSoft/1.08.466/APPDATA/OpenAL/openal-info.exe similarity index 100% rename from Resources/OpenALSoft/1.8.466/APPDATA/OpenAL/openal-info.exe rename to Resources/OpenALSoft/1.08.466/APPDATA/OpenAL/openal-info.exe diff --git a/Resources/OpenALSoft/1.8.466/APPDATA/OpenAL/readme.txt b/Resources/OpenALSoft/1.08.466/APPDATA/OpenAL/readme.txt similarity index 100% rename from Resources/OpenALSoft/1.8.466/APPDATA/OpenAL/readme.txt rename to Resources/OpenALSoft/1.08.466/APPDATA/OpenAL/readme.txt diff --git a/Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/COPYING b/Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/COPYING similarity index 100% rename from Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/COPYING rename to Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/COPYING diff --git a/Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/include/AL/al.h b/Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/include/AL/al.h similarity index 100% rename from Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/include/AL/al.h rename to Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/include/AL/al.h diff --git a/Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/include/AL/alc.h b/Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/include/AL/alc.h similarity index 100% rename from Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/include/AL/alc.h rename to Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/include/AL/alc.h diff --git a/Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/include/AL/alext.h b/Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/include/AL/alext.h similarity index 100% rename from Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/include/AL/alext.h rename to Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/include/AL/alext.h diff --git a/Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/lib/Win32/libOpenAL32.dll.a b/Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/lib/Win32/libOpenAL32.dll.a similarity index 100% rename from Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/lib/Win32/libOpenAL32.dll.a rename to Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/lib/Win32/libOpenAL32.dll.a diff --git a/Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/openal-info.exe b/Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/openal-info.exe similarity index 100% rename from Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/openal-info.exe rename to Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/openal-info.exe diff --git a/Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/readme.txt b/Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/readme.txt similarity index 100% rename from Resources/OpenALSoft/1.9.563/APPDATA/OpenAL/readme.txt rename to Resources/OpenALSoft/1.09.563/APPDATA/OpenAL/readme.txt diff --git a/Resources/OpenALSoft/1.10.622/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.10.622/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.10.622/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.10.622/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.11.753/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.11.753/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.11.753/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.11.753/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.12.854/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.12.854/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.12.854/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.12.854/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.13/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.13/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.13/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.13/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.14/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.14/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.14/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.14/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.15.1/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.15.1/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.15.1/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.15.1/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.15.1/APPDATA/OpenAL/Win64/soft_oal.dll b/Resources/OpenALSoft/1.15.1/APPDATA/OpenAL/bin/Win64/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.15.1/APPDATA/OpenAL/Win64/soft_oal.dll rename to Resources/OpenALSoft/1.15.1/APPDATA/OpenAL/bin/Win64/soft_oal.dll diff --git a/Resources/OpenALSoft/1.15/APPDATA/OpenAL/Win32/soft_oal.dll b/Resources/OpenALSoft/1.15/APPDATA/OpenAL/bin/Win32/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.15/APPDATA/OpenAL/Win32/soft_oal.dll rename to Resources/OpenALSoft/1.15/APPDATA/OpenAL/bin/Win32/soft_oal.dll diff --git a/Resources/OpenALSoft/1.15/APPDATA/OpenAL/Win64/soft_oal.dll b/Resources/OpenALSoft/1.15/APPDATA/OpenAL/bin/Win64/soft_oal.dll similarity index 100% rename from Resources/OpenALSoft/1.15/APPDATA/OpenAL/Win64/soft_oal.dll rename to Resources/OpenALSoft/1.15/APPDATA/OpenAL/bin/Win64/soft_oal.dll diff --git a/UniversAL 3D Audio Manager.bat b/UniversAL 3D Audio Manager.bat index e52aa24..64ec3b3 100644 --- a/UniversAL 3D Audio Manager.bat +++ b/UniversAL 3D Audio Manager.bat @@ -1,18 +1,19 @@ @echo off +Setlocal EnableDelayedExpansion ::Reset working folder. Needed when running as administrator. pushd %~dp0 ::Variables ::OpenAL Soft -SET OpenALSoftVersion=1.20.1 -SET OpenALSoftBranch=DirectSound + SET OpenALSoftVersion=1.20.1 + SET OpenALSoftBranch=DirectSound IF "%OpenALSoftBranch%"=="WASAPI" ( SET OpenALSoftVersionBranch=%OpenALSoftVersion%-%OpenALSoftBranch% ) else ( SET OpenALSoftVersionBranch=%OpenALSoftVersion% ) - SET OpenALSoftSetupFolder=Resources\OpenALSoft\%OpenALSoftVersionBranch% + SET OpenALSoftDLL=Resources\OpenALSoft\%OpenALSoftVersionBranch%\APPDATA\OpenAL\bin\Win32\soft_oal.dll SET OpenALSoftInstallationFolder=%APPDATA%\OpenAL SET OpenALSoftHRTFFolder=%OpenALSoftInstallationFolder%\HRTF SET OpenALSoftPresetsFolder=%OpenALSoftInstallationFolder%\presets @@ -22,16 +23,16 @@ SET OpenALSoftBranch=DirectSound SET OpenALDLLx32Path=SysWOW64\OpenAL32.dll SET OpenALDLLx64Path=System32\OpenAL32.dll ::DSOAL -SET DSOALVersion=1.31a -SET OpenALSoftDSOALVersion=1.19.1 -SET OpenALSoftDSOALBranch=DirectSound + SET DSOALVersion=1.31a + SET OpenALSoftDSOALVersion=1.19.1 + SET OpenALSoftDSOALBranch=DirectSound IF "%OpenALSoftDSOALBranch%"=="WASAPI" ( SET OpenALSoftDSOALVersionBranch=%OpenALSoftDSOALVersion%-%OpenALSoftDSOALBranch% ) else ( SET OpenALSoftDSOALVersionBranch=%OpenALSoftDSOALVersion% ) - SET OpenALSoftDSOALSetupFolder=Resources\OpenALSoft\%OpenALSoftDSOALVersionBranch% - SET DSOALSetupFolder=Resources\DSOAL\%DSOALVersion% + SET OpenALSoftDSOALDLL=Resources\OpenALSoft\%OpenALSoftDSOALVersionBranch%\APPDATA\OpenAL\bin\Win32\soft_oal.dll + SET DSOALDLL=Resources\DSOAL\%DSOALVersion%\GameExeFolder\dsound.dll SET GameExeFullPath=%~1 For %%A in ("%GameExeFullPath%") do ( SET "GameExeFolderPath=%%~dpA" @@ -73,30 +74,8 @@ echo.>>%LogFilePath% ::Install DSOAL :InstallDSOAL - ::Check if selected DSOAL version and branch exists - IF NOT EXIST %DSOALSetupFolder% ( - call :PrintAndLog "The folder for the selected DSOAL version and branch does not exist." - call :PrintAndLog "Please make sure that the variable DSOALVersion is set to the right value." - pause - exit - ) - - ::Check if selected OpenAL Soft version and branch exists - IF NOT EXIST %OpenALSoftDSOALSetupFolder% ( - call :PrintAndLog "The folder for the selected OpenAL Soft DSOAL version and branch does not exist." - call :PrintAndLog "Please make sure that the variables OpenALSoftDSOALVersion and OpenALSoftDSOALBranch are set to the right values." - pause - exit - ) - ::Info call :SplashInfo - call :PrintAndLog "- DSOAL version: %DSOALVersion%" - call :PrintAndLog "- OpenAL Soft version: %OpenALSoftDSOALVersionBranch%" - echo. - call :PrintAndLog "- Game folder: %GameExeFolderPath%" - call :PrintAndLog "- Game executable: %GameExeFilename%" - echo. call :PrintAndLog "This script will:" call :PrintAndLog "- Backup and/or (re)install DSOAL using existing OpenAL Soft global settings." call :PrintAndLog "- Set default playback device's format to 24 bit, 48000hz." @@ -111,8 +90,34 @@ echo.>>%LogFilePath% ) call :PrintAndLog "- Fix DirectSound references in the registry." echo. - pause + call :PrintAndLog "- Game folder: %GameExeFolderPath%" + call :PrintAndLog "- Game executable: %GameExeFilename%" + echo. + call :PrintAndLog "- DSOAL version: %DSOALVersion%" + call :PrintAndLog "- OpenAL Soft version: %OpenALSoftDSOALVersionBranch%" + echo. + ::Go to version selection when selecting N. Otherwise, proceed with installation by pressing Y + set MenuOption=NULL + CHOICE /M "Proceed with selected versions?" + IF !ERRORLEVEL!==2 (call :SelectDSOALOpenALSoftVersion) + + ::Check if selected DSOAL version and branch exists + IF NOT EXIST !DSOALDLL! ( + cls + call :PrintAndLog "The DSOAL DLL (%DSOALDLL%) does not exist." + goto :SelectDSOALVersionList + exit + ) + + ::Check if selected OpenAL Soft version and branch exists + IF NOT EXIST !OpenALSoftDSOALDLL! ( + cls + call :PrintAndLog "The OpenAL Soft DLL (%OpenALSoftDSOALDLL%) does not exist." + goto :SelectDSOALOpenALSoftVersionList + exit + ) + ::Info title UniversAL 3D Audio Manager v%ScriptVersion% - Installing: DSOAL v%DSOALVersion% - OpenAL Soft v%OpenALSoftDSOALVersionBranch% call :SplashInfoDSOALSmall @@ -162,10 +167,10 @@ echo.>>%LogFilePath% IF EXIST "%BackupPath%\GameExeFolder\dsoal-aldrv.dll" ( IF EXIST "%BackupPath%\GameExeFolder\alsoft.ini" ( IF EXIST "%BackupPath%\GameExeFolder\OpenAL\" ( - call :PrintAndLog "DSOAL has been successfully backed up!" + call :PrintAndLog "DSOAL has been successfully backed up." echo. ) else ( - call :PrintAndLog "DSOAL backup has failed!" + call :PrintAndLog "DSOAL backup has failed." goto DSOALFailure ) ) @@ -230,7 +235,7 @@ echo.>>%LogFilePath% IF EXIST "%GameExeFolderPath%dsound.dll" ( IF EXIST "%GameExeFolderPath%dsoal-aldrv.dll" ( IF EXIST "%GameExeFolderPath%alsoft.ini" ( - call :PrintAndLog "DSOAL v%DSOALVersion% has been successfully installed!" + call :PrintAndLog "DSOAL v%DSOALVersion% has been successfully installed." ) else ( goto DSOALFailure ) @@ -254,7 +259,7 @@ echo.>>%LogFilePath% ::Complete :DSOALFinish - call :PrintAndLog ":::::::::::::::::::: DSOAL v%DSOALVersion% has been installed successfully! ::::::::::::::::::::" + call :PrintAndLog ":::::::::::::::::::: DSOAL v%DSOALVersion% has been installed successfully ::::::::::::::::::::" call :Notes call :PrintAndLog "- Enable DirectSound3D/EAX/Hardware acceleration if the game has any of those audio options." echo. @@ -271,26 +276,21 @@ echo.>>%LogFilePath% IF EXIST "%OpenALSoftINIPath%" ( IF EXIST "%WINDIR%\%OpenALDLLx32Path%" ( IF EXIST "%WINDIR%\%OpenALDLLx64Path%" ( - call :PrintAndLog "OpenAL Soft installation found! You can proceed to install DSOAL." + call :PrintAndLog "OpenAL Soft installation found. You can proceed to install DSOAL." ) else ( - ::call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." - call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." + call :PrintAndLog "OpenAL Soft installation was not found or not properly installed. Please (re)install it before installing DSOAL." ) ) else ( - ::call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." - call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." + call :PrintAndLog "OpenAL Soft installation was not found or not properly installed. Please (re)install it before installing DSOAL." ) ) else ( - ::call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." - call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." + call :PrintAndLog "OpenAL Soft installation was not found or not properly installed. Please (re)install it before installing DSOAL." ) ) else ( - ::call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." - call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." + call :PrintAndLog "OpenAL Soft installation was not found or not properly installed. Please (re)install it before installing DSOAL." ) ) else ( - ::call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." - call :PrintAndLog "OpenAL Soft installation was not found or not properly installed! Please (re)install it before installing DSOAL." + call :PrintAndLog "OpenAL Soft installation was not found or not properly installed. Please (re)install it before installing DSOAL." ) echo. @@ -318,12 +318,11 @@ echo.>>%LogFilePath% :GOTADMIN ::OpenAL Soft - +:InstallOpenALSoft + ::Info cls call :SplashInfo - call :PrintAndLog "- OpenAL Soft version: v%OpenALSoftVersionBranch%" - echo. call :PrintAndLog "This script will:" call :PrintAndLog "- Install OpenAL redistributable." call :PrintAndLog "- Backup and/or (re)install OpenAL Soft." @@ -339,15 +338,21 @@ echo.>>%LogFilePath% call :PrintAndLog " - Exclusive Mode" ) echo. - pause + call :PrintAndLog "- OpenAL Soft version: v%OpenALSoftVersionBranch%" + echo. + + ::Go to version selection when selecting N. Otherwise, proceed with installation by pressing Y + set MenuOption=NULL + CHOICE /M "Proceed with selected version?" + IF !ERRORLEVEL!==2 (call :SelectOpenALSoftVersion) ::Check if selected OpenAL Soft version and branch exists - IF NOT EXIST %OpenALSoftSetupFolder% ( - call :PrintAndLog "The folder for the selected OpenAL Soft version and branch does not exist." - call :PrintAndLog "Please make sure that the variables OpenALSoftVersion and OpenALSoftBranch are set to the right values." - pause - exit - ) + IF NOT EXIST !OpenALSoftDLL! ( + cls + call :PrintAndLog "The OpenAL Soft DLL (%OpenALSoftDLL%) does not exist." + goto :SelectOpenALSoftVersionList + exit + ) ::Info title UniversAL 3D Audio Manager v%ScriptVersion% - Installing: OpenAL Soft v%OpenALSoftVersionBranch% @@ -358,13 +363,13 @@ echo.>>%LogFilePath% Resources\OpenAL\Installer\oalinst.exe /SILENT >>%LogFilePath% IF EXIST "%WINDIR%\%OpenALDLLx32Path%" ( IF EXIST "%WINDIR%\%OpenALDLLx64Path%" ( - call :PrintAndLog "OpenAL has been successfully installed!" + call :PrintAndLog "OpenAL has been successfully installed." ) else ( - call :PrintAndLog "OpenAL installation has failed!" + call :PrintAndLog "OpenAL installation has failed." goto OpenALSoftFailure ) ) else ( - call :PrintAndLog "OpenAL installation has failed!" + call :PrintAndLog "OpenAL installation has failed." goto OpenALSoftFailure ) echo. @@ -402,15 +407,15 @@ echo.>>%LogFilePath% ) ::Verify OpenAL Soft backup IF EXIST "%BackupPath%" ( - call :PrintAndLog "OpenAL Soft has been successfully backed up!" + call :PrintAndLog "OpenAL Soft has been successfully backed up." ) else ( - call :PrintAndLog "OpenAL Soft backup has failed!" + call :PrintAndLog "OpenAL Soft backup has failed." goto OpenALSoftFailure ) echo. ::Install OpenAL Soft - call :PrintAndLog "Installing OpenAL Soft v%OpenALSoftVersion%..." + call :PrintAndLog "Installing OpenAL Soft v%OpenALSoftVersionBranch%..." ::Install HRTF folder xcopy "Resources\Common\OpenAL\HRTF" "%OpenALSoftHRTFFolder%\" /s /y >>%LogFilePath% ::Install alsoft.ini @@ -453,42 +458,46 @@ echo.>>%LogFilePath% IF EXIST "%OpenALSoftHRTFFolder%" ( IF EXIST "%OpenALSoftINIPath%" ( IF EXIST "%WINDIR%\%OpenALDLLx32Path%" ( - IF EXIST "%WINDIR%\%OpenALDLLx64Path%" ( - call :PrintAndLog "OpenAL Soft v%OpenALSoftVersion% has been successfully installed!" - ) else ( - call :PrintAndLog "OpenAL Soft v%OpenALSoftVersion% installation has failed!" - goto OpenALSoftFailure - ) + call :PrintAndLog "OpenAL Soft v%OpenALSoftVersionBranch% has been successfully installed." ) else ( - call :PrintAndLog "OpenAL Soft v%OpenALSoftVersion% installation has failed!" + call :PrintAndLog "OpenAL Soft v%OpenALSoftVersionBranch% installation has failed." + call :PrintAndLog "%WINDIR%\%OpenALDLLx32Path% does not exist." goto OpenALSoftFailure ) ) else ( - call :PrintAndLog "OpenAL Soft v%OpenALSoftVersion% installation has failed!" + call :PrintAndLog "OpenAL Soft v%OpenALSoftVersionBranch% installation has failed." + call :PrintAndLog "%OpenALSoftINIPath% does not exist." goto OpenALSoftFailure ) ) else ( - call :PrintAndLog "OpenAL Soft v%OpenALSoftVersion% installation has failed!" + call :PrintAndLog "OpenAL Soft v%OpenALSoftVersionBranch% installation has failed." + call :PrintAndLog "%OpenALSoftHRTFFolder% does not exist." goto OpenALSoftFailure ) ) else ( - call :PrintAndLog "OpenAL Soft v%OpenALSoftVersion% installation has failed!" + call :PrintAndLog "OpenAL Soft v%OpenALSoftVersionBranch% installation has failed." + call :PrintAndLog "%OpenALSoftInstallationFolder% does not exist." goto OpenALSoftFailure ) - echo. + echo. call :AutoConfigGeneral call :AutoConfigOpenALSoft call :CleanupLog ::Complete -call :PrintAndLog ":::::::::::::::::::: OpenAL Soft v%OpenALSoftVersion% has been installed successfully! ::::::::::::::::::::" +call :PrintAndLog ":::::::::::::::::::: OpenAL Soft v%OpenALSoftVersionBranch% has been installed successfully. ::::::::::::::::::::" call :Notes -call :PrintAndLog "Press any key to run the configuration tool in case you need to set your Preferred HRTF in the HRTF tab." -call :PrintAndLog "Otherwise, close this window." -echo. + +if exist %OpenALSoftInstallationFolder%\alsoft-config\alsoft-config.exe ( + call :PrintAndLog "Press any key to run the configuration tool in case you need to set your Preferred HRTF in the HRTF tab." + call :PrintAndLog "Otherwise, close this window." + echo. + pause + start %OpenALSoftInstallationFolder%\alsoft-config\alsoft-config.exe + exit + ) pause -start %OpenALSoftInstallationFolder%\alsoft-config\alsoft-config.exe exit @@ -499,7 +508,7 @@ exit :Notes -call :PrintAndLog "Notes:" +call :PrintAndLog "Notes:" call :PrintAndLog "- Log is located in %LogFilePath%" call :PrintAndLog "- Backup is located in %BackupPath%" call :PrintAndLog "- Disable any other audio effects, except for headphones equalization if needed." @@ -534,6 +543,122 @@ echo. EXIT /B 0 +::Wrapper version selection + ::Select DSOAL version + :SelectDSOALOpenALSoftVersion + cls + call :PrintAndLog "Currently selected DSOAL version: !DSOALVersion!" + ::Version folder selection + :SelectDSOALVersionList + set count=0 + cd Resources\DSOAL + for /d %%x in (*) do ( + set /a count=count+1 + set choice[!count!]=%%x + ) + pushd %~dp0 + echo To change, select a different version's number then press Enter. + echo. + ::Print list of versions/folders + for /l %%x in (1,1,!count!) do ( + if %%x LEQ 9 ( + echo %%x] !choice[%%x]! + ) else ( + echo %%x] !choice[%%x]! + ) + ) + echo. + ::Prompt user selection + set /p DSOALVersionSelect=? + echo. + ::Update DSOAL OpenAL Soft version + set DSOALVersion=!choice[%DSOALVersionSelect%]! + SET OpenALSoftDSOALDLL=Resources\OpenALSoft\%OpenALSoftDSOALVersionBranch%\APPDATA\OpenAL\bin\Win32\soft_oal.dll + ::Select OpenAL Soft version + cls + call :PrintAndLog "Currently selected OpenAL Soft version: !OpenALSoftDSOALVersionBranch!" + ::Version folder selection + :SelectDSOALOpenALSoftVersionList + set count=0 + cd Resources\OpenALSoft + for /d %%x in (*) do ( + set /a count=count+1 + set choice[!count!]=%%x + ) + pushd %~dp0 + echo To change, select a different version's number then press Enter. + echo. + ::Print list of versions/folders + for /l %%x in (1,1,!count!) do ( + if %%x LEQ 9 ( + echo %%x] !choice[%%x]! + ) else ( + echo %%x] !choice[%%x]! + ) + ) + echo. + ::Prompt user selection + set /p OpenALSoftDSOALVersionSelect=? + echo. + ::Update DSOAL OpenAL Soft + set OpenALSoftDSOALVersionBranch=!choice[%OpenALSoftDSOALVersionSelect%]! + ::Update branch + echo/%OpenALSoftDSOALVersionBranch%|find "WASAPI" >nul + if !errorlevel! == 0 ( + SET OpenALSoftDSOALVersion=!OpenALSoftDSOALVersionBranch:-WASAPI=! + SET OpenALSoftDSOALBranch%=WASAPI + ) else ( + SET OpenALSoftDSOALBranch=!OpenALSoftDSOALVersionBranch! + SET OpenALSoftBranch%=DirectSound + ) + SET OpenALSoftDSOALDLL=Resources\OpenALSoft\%OpenALSoftDSOALVersionBranch%\APPDATA\OpenAL\bin\Win32\soft_oal.dll + SET DSOALDLL=Resources\DSOAL\%DSOALVersion%\GameExeFolder\dsound.dll + goto :InstallDSOAL +EXIT /B 0 + + ::Select OpenAL Soft version + :SelectOpenALSoftVersion + cls + call :PrintAndLog "Currently selected OpenAL Soft version: !OpenALSoftVersionBranch!" + ::Version folder selection + :SelectOpenALSoftVersionList + set count=0 + cd Resources\OpenALSoft + for /d %%x in (*) do ( + set /a count=count+1 + set choice[!count!]=%%x + ) + pushd %~dp0 + echo To change, select a different version's number then press Enter. + echo. + ::Print list of versions/folders + for /l %%x in (1,1,!count!) do ( + if %%x LEQ 9 ( + echo %%x] !choice[%%x]! + ) else ( + echo %%x] !choice[%%x]! + ) + ) + echo. + ::Prompt user selection + set /p OpenALSoftVersionSelect=? + echo. + ::Update OpenAL Soft + set OpenALSoftVersionBranch=!choice[%OpenALSoftVersionSelect%]! + ::Update branch + echo/%OpenALSoftVersionBranch%|find "WASAPI" >nul + if !errorlevel! == 0 ( + SET OpenALSoftVersion=!OpenALSoftVersionBranch:-WASAPI=! + SET OpenALSoftBranch%=WASAPI + SET OpenALSoftDLL=Resources\OpenALSoft\%OpenALSoftVersionBranch%\APPDATA\OpenAL\bin\Win32\soft_oal.dll + ) else ( + SET OpenALSoftVersion=!OpenALSoftVersionBranch! + SET OpenALSoftBranch%=DirectSound + SET OpenALSoftDLL=Resources\OpenALSoft\%OpenALSoftVersionBranch%\APPDATA\OpenAL\bin\Win32\soft_oal.dll) + goto :InstallOpenALSoft +EXIT /B 0 + + ::Register dsound.dll :RegisterDSound echo Registering DirectSound references (dsound.dll)... @@ -666,7 +791,7 @@ exit ::DSOAL failure :DSOALFailure -call :PrintAndLog "DSOAL v%DSOALVersion% installation has failed!" +call :PrintAndLog "DSOAL v%DSOALVersion% installation has failed." call :PrintAndLog "Please run the script again." call :ReportLog pause