Turn the RtMidi module into a full standalone MIDI module

Removes the now-redundant platform MIDI infrastructure

src/86box.c

@@ -90,7 +90,6 @@
 #include <86box/video.h>
 #include <86box/ui.h>
 #include <86box/plat.h>
-#include <86box/plat_midi.h>
 #include <86box/version.h>
 
 

src/CMakeLists.txt

@@ -36,7 +36,7 @@ endif()
 # MACOSX_BUNDLE prepares a macOS application bundle including with the app icon
 add_executable(86Box WIN32 MACOSX_BUNDLE 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c
 	dma.c ddma.c nmi.c pic.c pit.c port_6x.c port_92.c ppi.c pci.c mca.c usb.c
-	device.c nvr.c nvr_at.c nvr_ps2.c rtmidi_midi.cpp ${APP_ICON_MACOSX})
+	device.c nvr.c nvr_at.c nvr_ps2.c ${APP_ICON_MACOSX})
 
 if(CPPTHREADS)
 	target_sources(86Box PRIVATE cpp11_thread.cpp)

src/config.c

@@ -64,7 +64,6 @@
 #include <86box/snd_mpu401.h>
 #include <86box/video.h>
 #include <86box/plat.h>
-#include <86box/plat_midi.h>
 #include <86box/plat_dir.h>
 #include <86box/ui.h>
 

src/include/86box/midi.h

@@ -95,7 +95,8 @@ extern void	midi_in_sysex(uint8_t *buffer, uint32_t len);
 #define MIDI_INPUT_INTERNAL_NAME "midi_in"
 
 #ifdef EMU_DEVICE_H
-extern const device_t system_midi_device;
+extern const device_t rtmidi_device;
+extern const device_t rtmidi_input_device;
 #ifdef USE_FLUIDSYNTH
 extern const device_t fluidsynth_device;
 #endif

src/include/86box/midi_input.h

@@ -1 +0,0 @@
-extern const device_t midi_input_device;

src/include/86box/midi_rtmidi.h

@@ -0,0 +1,13 @@
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern int	rtmidi_get_num_devs(void);
+extern void	rtmidi_get_dev_name(int num, char *s);
+extern int	rtmidi_in_get_num_devs(void);
+extern void	rtmidi_in_get_dev_name(int num, char *s);
+
+#ifdef __cplusplus
+}
+#endif

src/include/86box/midi_system.h

@@ -1 +0,0 @@
-extern const device_t system_midi_device;

src/include/86box/plat_midi.h

@@ -1,15 +0,0 @@
-extern void	plat_midi_init(void);
-extern void	plat_midi_close(void);
-
-extern void	plat_midi_play_msg(uint8_t *msg);
-extern void	plat_midi_play_sysex(uint8_t *sysex, unsigned int len);
-extern int	plat_midi_write(uint8_t val);
-
-extern int	plat_midi_get_num_devs(void);
-extern void	plat_midi_get_dev_name(int num, char *s);
-
-extern void plat_midi_input_init(void);
-extern void plat_midi_input_close(void);
-
-extern int plat_midi_in_get_num_devs(void);
-extern void plat_midi_in_get_dev_name(int num, char *s);

src/sound/CMakeLists.txt

@@ -14,7 +14,7 @@
 #
 
 add_library(snd OBJECT sound.c openal.c snd_opl.c snd_opl_nuked.c snd_resid.cc
-	midi.c midi_system.c snd_speaker.c snd_pssj.c snd_lpt_dac.c snd_ac97_codec.c snd_ac97_via.c
+	midi.c midi_rtmidi.cpp snd_speaker.c snd_pssj.c snd_lpt_dac.c snd_ac97_codec.c snd_ac97_via.c
 	snd_lpt_dss.c snd_adlib.c snd_adlibgold.c snd_ad1848.c snd_audiopci.c
 	snd_azt2316a.c snd_cms.c snd_cs423x.c snd_gus.c snd_sb.c snd_sb_dsp.c
 	snd_emu8k.c snd_mpu401.c snd_sn76489.c snd_ssi2001.c snd_wss.c snd_ym7128.c)

src/sound/midi.c

@@ -28,9 +28,7 @@
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/plat.h>
-#include <86box/plat_midi.h>
 #include <86box/midi.h>
-#include <86box/midi_input.h>
 
 
 int midi_device_current = 0;
@@ -84,14 +82,14 @@ static const MIDI_DEVICE devices[] =
     { "mt32",				&mt32_device		},
     { "cm32l",				&cm32l_device		},
 #endif
-    { SYSTEM_MIDI_INTERNAL_NAME,	&system_midi_device	},
+    { SYSTEM_MIDI_INTERNAL_NAME,	&rtmidi_device	},
     { "",				NULL			}
 };
 
 static const MIDI_IN_DEVICE midi_in_devices[] =
 {
     { "none",				NULL			},
-    { MIDI_INPUT_INTERNAL_NAME,		&midi_input_device	},
+    { MIDI_INPUT_INTERNAL_NAME,		&rtmidi_input_device	},
     { "",				NULL			}
 };
 

src/sound/midi_rtmidi.cpp

@@ -30,8 +30,9 @@
 extern "C"
 {
 #include <86box/86box.h>
+#include <86box/device.h>
 #include <86box/midi.h>
-#include <86box/plat_midi.h>
+#include <86box/midi_rtmidi.h>
 #include <86box/config.h>
 
 
@@ -42,19 +43,43 @@ static const int	midi_lengths[8] = {3, 3, 3, 3, 2, 2, 3, 1};
 
 
 int
-plat_midi_write(uint8_t val)
+rtmidi_write(uint8_t val)
 {
     return 0;
 }
 
 
-void plat_midi_init(void)
+void
+rtmidi_play_msg(uint8_t *msg)
 {
+    if (midiout)
+	midiout->sendMessage(msg, midi_lengths[(msg[0] >> 4) & 7]);
+}
+
+
+void
+rtmidi_play_sysex(uint8_t *sysex, unsigned int len)
+{
+    if (midiout)
+	midiout->sendMessage(sysex, len);
+}
+
+
+void*
+rtmidi_init(const device_t *info)
+{
+    midi_device_t* dev = (midi_device_t*)malloc(sizeof(midi_device_t));
+    memset(dev, 0, sizeof(midi_device_t));
+
+    dev->play_msg = rtmidi_play_msg;
+    dev->play_sysex = rtmidi_play_sysex;
+    dev->write = rtmidi_write;
+
     try {
 	if (!midiout) midiout = new RtMidiOut;
     } catch (RtMidiError& error) {
-        pclog("Failed to initialize MIDI output: %s\n", error.getMessage().c_str());
+	pclog("Failed to initialize MIDI output: %s\n", error.getMessage().c_str());
-        return;
+	return nullptr;
     }
 
     midi_out_id = config_get_int((char*)SYSTEM_MIDI_NAME, (char*)"midi", 0);
@@ -70,14 +95,18 @@ void plat_midi_init(void)
 		pclog("Failed to initialize MIDI output: %s\n", error.getMessage().c_str());
 		delete midiout;
 		midiout = nullptr;
-		return;
+		return nullptr;
 	}
     }
+
+    midi_init(dev);
+
+    return dev;
 }
 
 
 void
-plat_midi_close(void)
+rtmidi_close(void *p)
 {
     if (!midiout)
 	return;
@@ -86,11 +115,13 @@ plat_midi_close(void)
 
     delete midiout;
     midiout = nullptr;
+
+    midi_close();
 }
 
 
 int
-plat_midi_get_num_devs(void)
+rtmidi_get_num_devs(void)
 {
     if (!midiout) {
 	try {
@@ -105,30 +136,14 @@ plat_midi_get_num_devs(void)
 
 
 void
-plat_midi_play_msg(uint8_t *msg)
+rtmidi_get_dev_name(int num, char *s)
-{
-    if (midiout)
-	midiout->sendMessage(msg, midi_lengths[(msg[0] >> 4) & 7]);
-}
-
-
-void
-plat_midi_get_dev_name(int num, char *s)
 {
     strcpy(s, midiout->getPortName(num).c_str());
 }
 
 
 void
-plat_midi_play_sysex(uint8_t *sysex, unsigned int len)
+rtmidi_input_callback(double timeStamp, std::vector<unsigned char> *message, void *userData)
-{
-    if (midiout)
-	midiout->sendMessage(sysex, len);
-}
-
-
-static void
-plat_midi_callback(double timeStamp, std::vector<unsigned char> *message, void *userData)
 {
     if (message->size() <= 3)
 	midi_in_msg(message->data());
@@ -137,15 +152,18 @@ plat_midi_callback(double timeStamp, std::vector<unsigned char> *message, void *
 }
 
 
-void
+void*
-plat_midi_input_init(void)
+rtmidi_input_init(const device_t *info)
 {
+    midi_device_t* dev = (midi_device_t*)malloc(sizeof(midi_device_t));
+    memset(dev, 0, sizeof(midi_device_t));
+
     try {
 	if (!midiin)
 		midiin = new RtMidiIn;
     } catch (RtMidiError& error) {
 	pclog("Failed to initialize MIDI input: %s\n", error.getMessage().c_str());
-	return;
+	return nullptr;
     }
 
     midi_in_id = config_get_int((char*)SYSTEM_MIDI_NAME, (char*)"midi_input", 0);
@@ -161,16 +179,24 @@ plat_midi_input_init(void)
 		pclog("Failed to initialize MIDI input: %s\n", error.getMessage().c_str());
 		delete midiin;
 		midiin = nullptr;
-		return;
+		return nullptr;
 	}
     }
 
-    midiin->setCallback(plat_midi_callback);
+    midiin->setCallback(rtmidi_input_callback);
+
+    midi_in_init(dev, &midi_in);
+
+    midi_in->midi_realtime = device_get_config_int("realtime");
+    midi_in->thruchan = device_get_config_int("thruchan");
+    midi_in->midi_clockout = device_get_config_int("clockout");
+
+    return dev;
 }
 
 
 void
-plat_midi_input_close(void)
+rtmidi_input_close(void* p)
 {
     midiin->cancelCallback();
     midiin->closePort();
@@ -178,12 +204,12 @@ plat_midi_input_close(void)
     delete midiin;
     midiin = nullptr;
 
-    return;
+    midi_close();
 }
 
 
 int
-plat_midi_in_get_num_devs(void)
+rtmidi_in_get_num_devs(void)
 {
     if (!midiin) {
 	try {
@@ -198,9 +224,65 @@ plat_midi_in_get_num_devs(void)
 
 
 void
-plat_midi_in_get_dev_name(int num, char *s)
+rtmidi_in_get_dev_name(int num, char *s)
 {
     strcpy(s, midiin->getPortName(num).c_str());
 }
 
+static const device_config_t system_midi_config[] =
+{
+    {
+	"midi", "MIDI out device", CONFIG_MIDI, "", 0
+    },
+    {
+	"", "", -1
+    }
+};
+
+static const device_config_t midi_input_config[] =
+{
+    {
+	"midi_input", "MIDI in device", CONFIG_MIDI_IN, "", 0
+    },
+    {
+	"realtime", "MIDI Real time", CONFIG_BINARY, "", 0
+    },
+    {
+	"thruchan", "MIDI Thru", CONFIG_BINARY, "", 1
+    },
+    {
+	"clockout", "MIDI Clockout", CONFIG_BINARY, "", 1
+    },
+    {
+	"", "", -1
+    }
+};
+
+const device_t rtmidi_device =
+{
+    SYSTEM_MIDI_NAME,
+    0, 0,
+    rtmidi_init,
+    rtmidi_close,
+    NULL,
+    { rtmidi_get_num_devs },
+    NULL,
+    NULL,
+    system_midi_config
+};
+
+
+const device_t rtmidi_input_device =
+{
+    MIDI_INPUT_NAME,
+    0, 0,
+    rtmidi_input_init,
+    rtmidi_input_close,
+    NULL,
+    { rtmidi_in_get_num_devs },
+    NULL,
+    NULL,
+    midi_input_config
+};
+
 }

src/sound/midi_system.c

@@ -1,139 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/device.h>
-#include <86box/plat.h>
-#include <86box/plat_midi.h>
-#include <86box/midi.h>
-#include <86box/midi_input.h>
-
-
-void* system_midi_init(const device_t *info)
-{
-        midi_device_t* dev = malloc(sizeof(midi_device_t));
-        memset(dev, 0, sizeof(midi_device_t));
-
-        dev->play_msg = plat_midi_play_msg;
-        dev->play_sysex = plat_midi_play_sysex;
-        dev->write = plat_midi_write;
-
-        plat_midi_init();
-
-        midi_init(dev);
-
-        return dev;
-}
-
-void* midi_input_init(const device_t *info)
-{
-        midi_device_t* dev = malloc(sizeof(midi_device_t));
-        memset(dev, 0, sizeof(midi_device_t));
-
-        plat_midi_input_init();
-
-        midi_in_init(dev, &midi_in);
-
-		midi_in->midi_realtime = device_get_config_int("realtime");
-		midi_in->thruchan = device_get_config_int("thruchan");
-		midi_in->midi_clockout = device_get_config_int("clockout");
-
-        return dev;
-}
-
-void system_midi_close(void* p)
-{
-        plat_midi_close();
-
-        midi_close();
-}
-
-void midi_input_close(void* p)
-{
-        plat_midi_input_close();
-
-        midi_close();
-}
-
-int system_midi_available(void)
-{
-        return plat_midi_get_num_devs();
-}
-
-int midi_input_available(void)
-{
-        return plat_midi_in_get_num_devs();
-}
-
-static const device_config_t system_midi_config[] =
-{
-        {
-                .name = "midi",
-                .description = "MIDI out device",
-                .type = CONFIG_MIDI,
-                .default_int = 0
-        },
-        {
-                .type = -1
-        }
-};
-
-static const device_config_t midi_input_config[] =
-{
-        {
-                .name = "midi_input", 
-				.description = "MIDI in device", 
-				.type = CONFIG_MIDI_IN, 
-				.default_int = 0
-        },
-        {
-                .name = "realtime", 
-				.description = "MIDI Real time", 
-				.type = CONFIG_BINARY, 
-				.default_int = 0
-        },
-        {
-                .name = "thruchan", 
-				.description = "MIDI Thru", 
-				.type = CONFIG_BINARY, 
-				.default_int = 1
-        },
-        {
-                .name = "clockout", 
-				.description = "MIDI Clockout", 
-				.type = CONFIG_BINARY, 
-				.default_int = 1
-        },
-        {
-                .type = -1
-        }
-};
-
-const device_t system_midi_device =
-{
-        SYSTEM_MIDI_NAME,
-        0, 0,
-        system_midi_init,
-        system_midi_close,
-	NULL,
-        { system_midi_available },
-        NULL,
-        NULL,
-        system_midi_config
-};
-
-
-const device_t midi_input_device =
-{
-        MIDI_INPUT_NAME,
-        0, 0,
-        midi_input_init,
-        midi_input_close,
-	NULL,
-        { midi_input_available },
-        NULL,
-        NULL,
-        midi_input_config
-};

src/unix/CMakeLists.txt

@@ -1,32 +1,4 @@
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+add_library(plat OBJECT unix.c)
-    find_package(ALSA)
-    if (ALSA_FOUND)
-        set(PLAT_SOURCES linux_midi_alsa.c)
-    else()
-        set(PLAT_SOURCES unix_midi.c)
-    endif()
-else()
-    set(PLAT_SOURCES unix_midi.c)
-endif()
-add_library(plat STATIC ${PLAT_SOURCES})
-add_library(ui STATIC unix.c unix_sdl.c unix_cdrom.c)
-target_compile_definitions(ui PUBLIC _FILE_OFFSET_BITS=64)
-target_link_libraries(ui dl)
-
-find_package(SDL2 REQUIRED)
-include_directories(${SDL2_INCLUDE_DIRS})
-if(MINGW)
-	target_link_libraries(ui SDL2::SDL2-static)
-else()
-        if (TARGET SDL2::SDL2)
-                target_link_libraries(ui SDL2::SDL2)
-        else()
-                target_link_libraries(ui ${SDL2_LIBRARIES})
-        endif()
-endif()
-if (ALSA_FOUND)
-    target_link_libraries(plat ALSA::ALSA)
-endif()
 
 if (NOT CPPTHREADS)
     target_sources(plat PRIVATE unix_thread.c)
@@ -35,3 +7,7 @@ endif()
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads REQUIRED)
 target_link_libraries(86Box Threads::Threads)
+
+add_library(ui OBJECT unix_sdl.c unix_cdrom.c)
+target_compile_definitions(ui PUBLIC _FILE_OFFSET_BITS=64)
+target_link_libraries(ui dl)

src/unix/linux_midi_alsa.c

@@ -1,326 +0,0 @@
-#include <alsa/asoundlib.h>
-#include <86box/86box.h>
-#include <86box/config.h>
-#include <86box/midi.h>
-#include <86box/plat.h>
-#include <86box/plat_midi.h>
-
-#define MAX_MIDI_DEVICES 128
-
-static struct
-{
-	int card;
-	int device;
-	int sub;
-	char name[50];
-} midi_devices[MAX_MIDI_DEVICES], midi_in_devices[MAX_MIDI_DEVICES];
-
-static int midi_device_count = 0, midi_in_device_count = 0;
-
-static int midi_queried = 0, midi_in_queried = 0;
-
-static snd_rawmidi_t *midiout = NULL, *midiin = NULL;
-
-static void plat_midi_query()
-{
-	int status;
-	int card = -1;
-
-	midi_queried = 1;
-
-	if ((status = snd_card_next(&card)) < 0)
-		return;
-
-	if (card < 0)
-		return; /*No cards*/
-
-	while (card >= 0)
-	{
-		char *shortname;
-
-		if ((status = snd_card_get_name(card, &shortname)) >= 0)
-		{
-			snd_ctl_t *ctl;
-			char name[32];
-
-			sprintf(name, "hw:%i", card);
-
-			if ((status = snd_ctl_open(&ctl, name, 0)) >= 0)
-			{
-				int device = -1;
-
-				do
-				{
-					status = snd_ctl_rawmidi_next_device(ctl, &device);
-					if (status >= 0 && device != -1)
-					{
-						snd_rawmidi_info_t *info;
-						int sub_nr, sub;
-
-						snd_rawmidi_info_alloca(&info);
-						snd_rawmidi_info_set_device(info, device);
-						snd_rawmidi_info_set_stream(info, SND_RAWMIDI_STREAM_OUTPUT);
-						snd_ctl_rawmidi_info(ctl, info);
-						sub_nr = snd_rawmidi_info_get_subdevices_count(info);
-						//pclog("sub_nr=%i\n",sub_nr);
-
-						for (sub = 0; sub < sub_nr; sub++)
-						{
-							snd_rawmidi_info_set_subdevice(info, sub);
-
-							if (snd_ctl_rawmidi_info(ctl, info) == 0)
-							{
-								//pclog("%s: MIDI device=%i:%i:%i\n", shortname, card, device,sub);
-
-								midi_devices[midi_device_count].card = card;
-								midi_devices[midi_device_count].device = device;
-								midi_devices[midi_device_count].sub = sub;
-								snprintf(midi_devices[midi_device_count].name, 50, "%s (%i:%i:%i)", shortname, card, device, sub);
-								midi_device_count++;
-								if (midi_device_count >= MAX_MIDI_DEVICES)
-									return;
-							}
-						}
-					}
-				} while (device >= 0);
-			}
-		}
-
-		if (snd_card_next(&card) < 0)
-			break;
-	}
-}
-
-void plat_midi_init()
-{
-	char portname[32];
-	int midi_id;
-
-	if (!midi_queried)
-		plat_midi_query();
-
-	midi_id = config_get_int(SYSTEM_MIDI_NAME, "midi", 0);
-
-	sprintf(portname, "hw:%i,%i,%i", midi_devices[midi_id].card,
-					 midi_devices[midi_id].device,
-					 midi_devices[midi_id].sub);
-	//pclog("Opening MIDI port %s\n", portname);
-
-	if (snd_rawmidi_open(NULL, &midiout, portname, SND_RAWMIDI_SYNC) < 0)
-	{
-		//pclog("Failed to open MIDI\n");
-		return;
-	}
-}
-
-void plat_midi_close()
-{
-	if (midiout != NULL)
-	{
-		snd_rawmidi_close(midiout);
-		midiout = NULL;
-	}
-}
-
-static int midi_pos, midi_len;
-static uint8_t midi_command[4];
-static int midi_lengths[8] = {3, 3, 3, 3, 2, 2, 3, 1};
-static int midi_insysex;
-static uint8_t midi_sysex_data[65536];
-
-int plat_midi_write(uint8_t val)
-{
-	return 0;
-}
-
-void plat_midi_play_sysex(uint8_t *sysex, unsigned int len)
-{
-	if (midiout)
-	{
-		snd_rawmidi_write(midiout, (const void*)sysex, (size_t)len);
-	}
-}
-
-void plat_midi_play_msg(uint8_t *msg)
-{
-	plat_midi_play_sysex(msg, midi_lengths[(msg[0] >> 4) & 7]);
-}
-
-int plat_midi_get_num_devs()
-{
-	if (!midi_queried)
-		plat_midi_query();
-
-	return midi_device_count;
-}
-
-void plat_midi_get_dev_name(int num, char *s)
-{
-	strcpy(s, midi_devices[num].name);
-}
-
-static void plat_midi_query_in()
-{
-	int status;
-	int card = -1;
-
-	midi_in_queried = 1;
-
-	if ((status = snd_card_next(&card)) < 0)
-		return;
-
-	if (card < 0)
-		return; /*No cards*/
-
-	while (card >= 0)
-	{
-		char *shortname;
-
-		if ((status = snd_card_get_name(card, &shortname)) >= 0)
-		{
-			snd_ctl_t *ctl;
-			char name[32];
-
-			sprintf(name, "hw:%i", card);
-
-			if ((status = snd_ctl_open(&ctl, name, 0)) >= 0)
-			{
-				int device = -1;
-
-				do
-				{
-					status = snd_ctl_rawmidi_next_device(ctl, &device);
-					if (status >= 0 && device != -1)
-					{
-						snd_rawmidi_info_t *info;
-						int sub_nr, sub;
-
-						snd_rawmidi_info_alloca(&info);
-						snd_rawmidi_info_set_device(info, device);
-						snd_rawmidi_info_set_stream(info, SND_RAWMIDI_STREAM_INPUT);
-						snd_ctl_rawmidi_info(ctl, info);
-						sub_nr = snd_rawmidi_info_get_subdevices_count(info);
-						//pclog("sub_nr=%i\n",sub_nr);
-
-						for (sub = 0; sub < sub_nr; sub++)
-						{
-							snd_rawmidi_info_set_subdevice(info, sub);
-
-							if (snd_ctl_rawmidi_info(ctl, info) == 0)
-							{
-								//pclog("%s: MIDI device=%i:%i:%i\n", shortname, card, device,sub);
-
-								midi_in_devices[midi_device_count].card = card;
-								midi_in_devices[midi_device_count].device = device;
-								midi_in_devices[midi_device_count].sub = sub;
-								snprintf(midi_in_devices[midi_device_count].name, 50, "%s (%i:%i:%i)", shortname, card, device, sub);
-								midi_in_device_count++;
-								if (midi_in_device_count >= MAX_MIDI_DEVICES)
-									return;
-							}
-						}
-					}
-				} while (device >= 0);
-			}
-		}
-
-		if (snd_card_next(&card) < 0)
-			break;
-	}
-}
-mutex_t* midiinmtx = NULL;
-
-static void plat_midi_in_thread(void* param)
-{
-	int sysexpos = 0;
-	uint8_t midimsg[3];
-	while(1)
-	{
-		thread_wait_mutex(midiinmtx);
-		if (midiin == NULL)
-		{
-			thread_release_mutex(midiinmtx);
-			break;
-		}
-		if (snd_rawmidi_read(midiin, midimsg, 1) > 0)
-		{
-			if (midimsg[0] == 0xF0)
-			{
-				MIDI_InSysexBuf[sysexpos++] = 0xF0;
-				while(1)
-				{
-					snd_rawmidi_read(midiin, &MIDI_InSysexBuf[sysexpos++], 1);
-					if (MIDI_InSysexBuf[sysexpos - 1] == 0xF7)
-					{
-						midi_in_sysex(MIDI_InSysexBuf, sysexpos);
-					}
-				}
-			}
-			else if (midimsg[0] & 0x80)
-			{
-				int lengthofmsg = midi_lengths[(midimsg[0] >> 4) & 7] - 1;
-				snd_rawmidi_read(midiin, midimsg + 1, lengthofmsg);
-				midi_in_msg(midimsg);
-			}
-		}
-		thread_release_mutex(midiinmtx);
-	}
-}
-
-void plat_midi_input_init(void)
-{
-	char portname[32];
-	int midi_id;
-	snd_rawmidi_params_t* params;
-	int err;
-
-	snd_rawmidi_params_malloc(&params);
-	if (!params) return;
-	if (!midi_in_queried)
-		plat_midi_query_in();
-
-	
-	midi_id = config_get_int(MIDI_INPUT_NAME, "midi_input", 0);
-
-	sprintf(portname, "hw:%i,%i,%i", midi_in_devices[midi_id].card,
-					 midi_in_devices[midi_id].device,
-					 midi_in_devices[midi_id].sub);
-	//pclog("Opening MIDI port %s\n", portname);
-
-	if (snd_rawmidi_open(NULL, &midiin, portname, SND_RAWMIDI_NONBLOCK) < 0)
-	{
-		//pclog("Failed to open MIDI\n");
-		return;
-	}
-	midiin = thread_create_mutex();
-	thread_create(plat_midi_in_thread, NULL);
-}
-
-void plat_midi_input_close(void)
-{
-	if (midiinmtx) thread_wait_mutex(midiinmtx);
-	if (midiin != NULL)
-	{
-		snd_rawmidi_close(midiin);
-		midiin = NULL;
-	}
-	if (midiinmtx)
-	{
-		thread_release_mutex(midiinmtx);
-		thread_close_mutex(midiinmtx);
-	}
-	midiinmtx = NULL;
-}
-
-int plat_midi_in_get_num_devs(void)
-{
-    if (!midi_queried)
-		plat_midi_query_in();
-	
-	return midi_in_device_count;
-}
-
-void plat_midi_in_get_dev_name(int num, char *s)
-{
-    strcpy(s, midi_in_devices[num].name);
-}

src/unix/unix_midi.c

@@ -1,57 +0,0 @@
-#include <inttypes.h>
-void	plat_midi_init(void)
-{
-
-}
-
-void	plat_midi_close(void)
-{
-
-}
-
-void	plat_midi_play_msg(uint8_t *msg)
-{
-
-}
-
-void	plat_midi_play_sysex(uint8_t *sysex, unsigned int len)
-{
-
-}
-
-int	plat_midi_write(uint8_t val)
-{
-    return 0;
-}
-
-int	plat_midi_get_num_devs(void)
-{
-    return 0;
-}
-
-void	plat_midi_get_dev_name(int num, char *s)
-{
-    s[0] = ' ';
-    s[1] = 0;
-}
-
-void plat_midi_input_init(void)
-{
-
-}
-
-void plat_midi_input_close(void)
-{
-
-}
-
-int plat_midi_in_get_num_devs(void)
-{
-    return 0;
-}
-
-void plat_midi_in_get_dev_name(int num, char *s)
-{
-    s[0] = ' ';
-    s[1] = 0;
-}

src/win/Makefile.mingw

@@ -475,7 +475,7 @@ CXXFLAGS	:= $(CFLAGS)
 #########################################################################
 MAINOBJ		:= 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
 		   nmi.o pic.o pit.o port_6x.o port_92.o ppi.o pci.o mca.o \
-		   usb.o device.o nvr.o nvr_at.o nvr_ps2.o rtmidi_midi.o \
+		   usb.o device.o nvr.o nvr_at.o nvr_ps2.o \
 		   $(VNCOBJ)
 
 MEMOBJ		:= catalyst_flash.o i2c_eeprom.o intel_flash.o mem.o rom.o smram.o spd.o sst_flash.o
@@ -617,7 +617,7 @@ SNDOBJ		:= sound.o \
 		     wave6581_P_T.o wave6581_PS_.o wave6581_PST.o \
 		     wave8580__ST.o wave8580_P_T.o wave8580_PS_.o \
 		     wave8580_PST.o wave.o \
-		    midi.o midi_system.o \
+		    midi.o midi_rtmidi.o \
 		    snd_speaker.o \
 		    snd_pssj.o \
 		    snd_lpt_dac.o snd_lpt_dss.o \

src/win/win.c

@@ -46,7 +46,6 @@
 #include <86box/video.h>
 #define GLOBAL
 #include <86box/plat.h>
-#include <86box/plat_midi.h>
 #include <86box/ui.h>
 #ifdef USE_VNC
 # include <86box/vnc.h>

src/win/win_devconf.c

@@ -25,7 +25,7 @@
 #include <86box/config.h>
 #include <86box/device.h>
 #include <86box/plat.h>
-#include <86box/plat_midi.h>
+#include <86box/midi_rtmidi.h>
 #include <86box/ui.h>
 #include <86box/win.h>
 #include <windowsx.h>
@@ -97,9 +97,9 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 					val_int = config_get_int((char *) config_device.name,
 								 (char *) config->name, config->default_int);
 
-					num  = plat_midi_get_num_devs();
+					num  = rtmidi_get_num_devs();
 					for (c = 0; c < num; c++) {
-						plat_midi_get_dev_name(c, s);
+						rtmidi_get_dev_name(c, s);
 						mbstowcs(lptsTemp, s, strlen(s) + 1);
 						SendMessage(h, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)lptsTemp);
 						if (val_int == c)
@@ -112,9 +112,9 @@ deviceconfig_dlgproc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 					val_int = config_get_int((char *) config_device.name,
 								 (char *) config->name, config->default_int);
 
-					num  = plat_midi_in_get_num_devs();
+					num  = rtmidi_in_get_num_devs();
 					for (c = 0; c < num; c++) {
-						plat_midi_in_get_dev_name(c, s);
+						rtmidi_in_get_dev_name(c, s);
 						mbstowcs(lptsTemp, s, strlen(s) + 1);
 						SendMessage(h, CB_ADDSTRING, 0, (LPARAM)(LPCSTR)lptsTemp);
 						if (val_int == c)

src/win/win_settings.c

@@ -64,7 +64,6 @@
 #include <86box/snd_mpu401.h>
 #include <86box/video.h>
 #include <86box/plat.h>
-#include <86box/plat_midi.h>
 #include <86box/ui.h>
 #include <86box/win.h>
 #include "../disk/minivhd/minivhd.h"

src/win/win_ui.c

@@ -39,7 +39,6 @@
 #include <86box/nvr.h>
 #include <86box/video.h>
 #include <86box/vid_ega.h>		// for update_overscan
-#include <86box/plat_midi.h>
 #include <86box/plat_dynld.h>
 #include <86box/ui.h>
 #include <86box/win.h>