Portmidi

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "3rdparty/rtmidi"]
-	path = 3rdparty/rtmidi
-	url = https://github.com/Wohlstand/rtmidi.git
+[submodule "3rdparty/portmidi"]
+	path = 3rdparty/portmidi
+	url = https://github.com/PortMidi/portmidi.git

CMakeLists.txt

@@ -172,18 +172,14 @@ endif()
 include(3rdparty/Utf8Main/utf8main.cmake)
 
 if(NOT WIN32 AND PKG_CONFIG_FOUND)
-    set(USE_RTMIDI TRUE)
-    option(USE_SYSTEM_RTMIDI "Use system libraries for RtMidi" OFF)
+    set(USE_PORTMIDI TRUE)
+    option(USE_SYSTEM_PORTMIDI "Use system libraries for PortMidi" OFF)
 endif()
 
 find_package(SDL2 REQUIRED)
 
-if(USE_RTMIDI)
-    if(USE_SYSTEM_RTMIDI)
-        pkg_check_modules(SYSTEM_RTMIDI rtmidi REQUIRED)
-    else()
-        include(RtMidi)
-    endif()
+if(USE_PORTMIDI)
+    add_subdirectory(3rdparty/portmidi)
 endif()
 
 
@@ -200,8 +196,8 @@ set(SC55_SRC
     src/utils/files.cpp src/utils/files.h
 )
 
-if(USE_RTMIDI)
-    list(APPEND SC55_SRC src/midi_rtmidi.cpp)
+if(USE_PORTMIDI)
+    list(APPEND SC55_SRC src/midi_portmidi.cpp)
 elseif(WIN32)
     list(APPEND SC55_SRC src/midi_win32.cpp)
 endif()
@@ -217,14 +213,8 @@ else()
     target_link_libraries(nuked-sc55 PRIVATE ${SDL2_LIBRARIES})
 endif()
 
-if(USE_RTMIDI)
-    if(USE_SYSTEM_RTMIDI)
-        target_compile_options(nuked-sc55 PRIVATE ${SYSTEM_RTMIDI_CFLAGS})
-        target_include_directories(nuked-sc55 PRIVATE ${SYSTEM_RTMIDI_INCLUDE_DIRS})
-        target_link_libraries(nuked-sc55 PRIVATE ${SYSTEM_RTMIDI_LIBRARIES})
-    else()
-        target_link_libraries(nuked-sc55 PRIVATE RtMidi)
-    endif()
+if(USE_PORTMIDI)
+    target_link_libraries(nuked-sc55 PRIVATE portmidi)
 endif()
 
 if(WIN32)

src/mcu.cpp

@@ -625,6 +625,8 @@ int SDLCALL work_thread(void* data)
         SM_Update(mcu.cycles);
 
         MCU_UpdateAnalog(mcu.cycles);
+
+        MIDI_Update();
     }
     MCU_WorkThread_Unlock();
 

src/midi.h

@@ -35,4 +35,5 @@
 
 int MIDI_Init(void);
 void MIDI_Quit(void);
+void MIDI_Update(void);
 

src/midi_portmidi.cpp

@@ -0,0 +1,67 @@
+#include <stdio.h>
+#include "mcu.h"
+#include "submcu.h"
+#include "midi.h"
+#include <portmidi.h>
+
+static PmStream *midiInStream;
+static bool sysExMode = false;
+
+void MIDI_Update()
+{
+    PmEvent event;
+    while (Pm_Read(midiInStream, &event, 1)) {
+        uint8_t command = (Pm_MessageStatus(event.message) >> 4);
+
+        SM_PostUART(Pm_MessageStatus(event.message));
+
+        if (sysExMode && Pm_MessageStatus(event.message) == 0xF7) {
+            sysExMode = false;
+        } else if (sysExMode || Pm_MessageStatus(event.message) == 0xF0) {
+            sysExMode = true;
+            SM_PostUART(Pm_MessageData1(event.message));
+            if (Pm_MessageData1(event.message) == 0xF7) {
+                sysExMode = false;
+                return;
+            }
+            SM_PostUART(Pm_MessageData2(event.message));
+            if (Pm_MessageData2(event.message) == 0xF7) {
+                sysExMode = false;
+                return;
+            }
+            SM_PostUART((((event.message) >> 24) & 0xFF));
+            if ((((event.message) >> 24) & 0xFF) == 0xF7) {
+                sysExMode = false;
+                return;
+            }
+        } else if (command == 0xC || command == 0xD || Pm_MessageStatus(event.message) == 0xF3) {
+            SM_PostUART(Pm_MessageData1(event.message));
+        } else if (command == 0x8 || command == 0x9 || command == 0xA || command == 0xB || command == 0xE){
+            SM_PostUART(Pm_MessageData1(event.message));
+            SM_PostUART(Pm_MessageData2(event.message));
+        }
+    }
+}
+
+int MIDI_Init(void)
+{
+    Pm_Initialize();
+
+    int in_id = Pm_CreateVirtualInput("Virtual SC55", NULL, NULL);
+
+    Pm_OpenInput(&midiInStream, in_id, NULL, 0, NULL, NULL);
+    Pm_SetFilter(midiInStream, PM_FILT_ACTIVE | PM_FILT_CLOCK);
+
+    // Empty the buffer, just in case anything got through
+    PmEvent receiveBuffer[1];
+    while (Pm_Poll(midiInStream)) {
+        Pm_Read(midiInStream, receiveBuffer, 1);
+    }
+
+    return 1;
+}
+
+void MIDI_Quit()
+{
+    Pm_Terminate();
+}

src/midi_win32.cpp

@@ -145,3 +145,7 @@ void MIDI_Quit()
         midi_handle = 0;
     }
 }
+
+void MIDI_Update()
+{
+}