From 2836c7f05b1b83233f0be0bc850ed43109dca73d Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 20 Feb 2022 00:14:07 -0500 Subject: [PATCH] CONFIG_MIDI -> CONFIG_MIDI_OUT --- src/include/86box/device.h | 2 +- src/qt/qt_deviceconfig.cpp | 2 +- src/sound/midi_rtmidi.cpp | 2 +- src/win/win_devconf.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/86box/device.h b/src/include/86box/device.h index eaae682f4..f3f3261f6 100644 --- a/src/include/86box/device.h +++ b/src/include/86box/device.h @@ -44,7 +44,7 @@ #define CONFIG_INT 1 #define CONFIG_BINARY 2 #define CONFIG_SELECTION 3 -#define CONFIG_MIDI 4 +#define CONFIG_MIDI_OUT 4 #define CONFIG_FNAME 5 #define CONFIG_SPINNER 6 #define CONFIG_HEX16 7 diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp index ac967f678..cf4161d30 100644 --- a/src/qt/qt_deviceconfig.cpp +++ b/src/qt/qt_deviceconfig.cpp @@ -178,7 +178,7 @@ void DeviceConfig::ConfigureDevice(const _device_* device, int instance, Setting config_set_int(device_context.name, const_cast(config->name), cbox->isChecked() ? 1 : 0); break; } - case CONFIG_MIDI: + case CONFIG_MIDI_OUT: case CONFIG_MIDI_IN: case CONFIG_SELECTION: { diff --git a/src/sound/midi_rtmidi.cpp b/src/sound/midi_rtmidi.cpp index 48877924c..ec943a43f 100644 --- a/src/sound/midi_rtmidi.cpp +++ b/src/sound/midi_rtmidi.cpp @@ -235,7 +235,7 @@ rtmidi_in_get_dev_name(int num, char *s) static const device_config_t system_midi_config[] = { { - "midi", "MIDI out device", CONFIG_MIDI, "", 0 + "midi", "MIDI out device", CONFIG_MIDI_OUT, "", 0 }, { "", "", -1 diff --git a/src/win/win_devconf.c b/src/win/win_devconf.c index c4de7d90b..b27b406d9 100644 --- a/src/win/win_devconf.c +++ b/src/win/win_devconf.c @@ -93,7 +93,7 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) id += 2; break; - case CONFIG_MIDI: + case CONFIG_MIDI_OUT: val_int = config_get_int((char *) config_device.name, (char *) config->name, config->default_int);