80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Rename rom define for old mt32

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-08-30 16:56:47 -04:00
parent b59f8ab14d
commit 1e201dce09
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/midi.h
View File

@@ -96,7 +96,7 @@ extern const device_t rtmidi_input_device;
extern const device_t fluidsynth_device; extern const device_t fluidsynth_device;
# endif # endif
# ifdef USE_MUNT # ifdef USE_MUNT
extern const device_t mt32_device; extern const device_t mt32_old_device;
extern const device_t cm32l_device; extern const device_t cm32l_device;
extern const device_t cm32ln_device; extern const device_t cm32ln_device;
# endif # endif

2
src/sound/midi.c
View File

@@ -92,7 +92,7 @@ static const MIDI_OUT_DEVICE devices[] = {
{ &fluidsynth_device }, { &fluidsynth_device },
#endif #endif
#ifdef USE_MUNT #ifdef USE_MUNT
{ &mt32_device }, { &mt32_old_device },
{ &cm32l_device }, { &cm32l_device },
{ &cm32ln_device }, { &cm32ln_device },
#endif #endif

26
src/sound/midi_mt32.c
View File

@@ -15,12 +15,12 @@
#include <86box/ui.h> #include <86box/ui.h>
#include <mt32emu/c_interface/c_interface.h> #include <mt32emu/c_interface/c_interface.h>
#define MT32_CTRL_ROM "roms/sound/mt32/MT32_CONTROL.ROM" #define MT32_OLD_CTRL_ROM "roms/sound/mt32/MT32_CONTROL.ROM"
#define MT32_PCM_ROM "roms/sound/mt32/MT32_PCM.ROM" #define MT32_OLD_PCM_ROM "roms/sound/mt32/MT32_PCM.ROM"
#define CM32L_CTRL_ROM "roms/sound/cm32l/CM32L_CONTROL.ROM" #define CM32L_CTRL_ROM "roms/sound/cm32l/CM32L_CONTROL.ROM"
#define CM32L_PCM_ROM "roms/sound/cm32l/CM32L_PCM.ROM" #define CM32L_PCM_ROM "roms/sound/cm32l/CM32L_PCM.ROM"
#define CM32LN_CTRL_ROM "roms/sound/cm32ln/CM32LN_CONTROL.ROM" #define CM32LN_CTRL_ROM "roms/sound/cm32ln/CM32LN_CONTROL.ROM"
#define CM32LN_PCM_ROM "roms/sound/cm32ln/CM32LN_PCM.ROM" #define CM32LN_PCM_ROM "roms/sound/cm32ln/CM32LN_PCM.ROM"
extern void givealbuffer_midi(void *buf, uint32_t size); extern void givealbuffer_midi(void *buf, uint32_t size);
extern void al_set_midi(int freq, int buf_size); extern void al_set_midi(int freq, int buf_size);
@@ -118,10 +118,10 @@ mt32_check(const char *func, mt32emu_return_code ret, mt32emu_return_code expect
} }
int int
mt32_available() mt32_old_available()
{ {
if (roms_present[0] < 0) if (roms_present[0] < 0)
roms_present[0] = (rom_present(MT32_CTRL_ROM) && rom_present(MT32_PCM_ROM)); roms_present[0] = (rom_present(MT32_OLD_CTRL_ROM) && rom_present(MT32_OLD_PCM_ROM));
return roms_present[0]; return roms_present[0];
} }
@@ -312,9 +312,9 @@ mt32emu_init(char *control_rom, char *pcm_rom)
} }
void * void *
mt32_init(const device_t *info) mt32_old_init(const device_t *info)
{ {
return mt32emu_init(MT32_CTRL_ROM, MT32_PCM_ROM); return mt32emu_init(MT32_OLD_CTRL_ROM, MT32_OLD_PCM_ROM);
} }
void * void *
@@ -404,15 +404,15 @@ static const device_config_t mt32_config[] = {
// clang-format on // clang-format on
}; };
const device_t mt32_device = { const device_t mt32_old_device = {
.name = "Roland MT-32 Emulation", .name = "Roland MT-32 Emulation",
.internal_name = "mt32", .internal_name = "mt32",
.flags = 0, .flags = 0,
.local = 0, .local = 0,
.init = mt32_init, .init = mt32_old_init,
.close = mt32_close, .close = mt32_close,
.reset = NULL, .reset = NULL,
{ .available = mt32_available }, { .available = mt32_old_available },
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = mt32_config .config = mt32_config