claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1640 from 86Box/master

Browse Source 
Brought the branch up to par with master.
This commit is contained in:
Miran Grča
2021-09-01 15:03:15 +02:00
committed by GitHub
parent 8afee010d0 e4197b8ca4
commit a505a6a910
55 changed files with 5492 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sound/midi_fluidsynth.c
View File

@@ -225,6 +225,8 @@ void* fluidsynth_init(const device_t *info)
/* Try loading the DLL. */
#ifdef _WIN32
fluidsynth_handle = dynld_module("libfluidsynth.dll", fluidsynth_imports);
#elif defined __APPLE__
fluidsynth_handle = dynld_module("libfluidsynth.dylib", fluidsynth_imports);
#else
fluidsynth_handle = dynld_module("libfluidsynth.so", fluidsynth_imports);
#endif

6
src/sound/openal.c
View File

@@ -26,9 +26,9 @@
# undef ALC_API
# define AL_LIBTYPE_STATIC
# define ALC_LIBTYPE_STATIC
# include <AL/al.h>
# include <AL/alc.h>
# include <AL/alext.h>
# include "AL/al.h"
# include "AL/alc.h"
# include "AL/alext.h"
#include <86box/86box.h>
#include <86box/sound.h>
#include <86box/midi.h>

32
src/sound/snd_ssi2001.c
View File

@@ -65,7 +65,8 @@ void *ssi2001_init(const device_t *info)
ssi2001->psid = sid_init();
sid_reset(ssi2001->psid);
io_sethandler(0x0280, 0x0020, ssi2001_read, NULL, NULL, ssi2001_write, NULL, NULL, ssi2001);
uint16_t addr = device_get_config_hex16("base");
io_sethandler(addr, 0x0020, ssi2001_read, NULL, NULL, ssi2001_write, NULL, NULL, ssi2001);
sound_add_handler(ssi2001_get_buffer, ssi2001);
return ssi2001;
}
@@ -79,11 +80,38 @@ void ssi2001_close(void *p)
free(ssi2001);
}
static const device_config_t ssi2001_config[] =
{
{
"base", "Address", CONFIG_HEX16, "", 0x280, "", { 0 },
{
{
"0x280", 0x280
},
{
"0x2A0", 0x2A0
},
{
"0x2C0", 0x2C0
},
{
"0x2E0", 0x2E0
},
{
""
}
}
},
{
"", "", -1
}
};
const device_t ssi2001_device =
{
"Innovation SSI-2001",
0, 0,
ssi2001_init, ssi2001_close, NULL,
{ NULL }, NULL, NULL,
NULL
ssi2001_config
};