Merge branch 'version/4.2' into feature/ess-audiodrive

2024-03-23 17:13:59 +01:00
parent 0af83efb8f 1d2a7e3bca
commit 759cca1582
217 changed files with 3847 additions and 42342 deletions
--- a/src/include/86box/sound.h
+++ b/src/include/86box/sound.h
@@ -123,10 +123,8 @@ extern const device_t cms_device;
 /* Gravis UltraSound and UltraSound Max */
 extern const device_t gus_device;

-#    if defined(DEV_BRANCH) && defined(USE_PAS16)
 /* Pro Audio Spectrum 16 */
 extern const device_t pas16_device;
-#    endif

 /* IBM PS/1 Audio Card */
 extern const device_t ps1snd_device;