Add support for multiple devices

jamulussoftware · Dec 1, 2024 · 09d7397 · 09d7397
1 parent f058359
commit 09d7397
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 19 deletions.
diff --git a/src/sound/asio/sound.cpp b/src/sound/asio/sound.cpp
@@ -1239,34 +1239,49 @@ int64_t CSound::Flip64Bits ( const int64_t iIn )
 // Windows Native MIDI support
 void CSound::MidiStart()
 {
-    midiPort = 0; // might want to make this settable, Windows allocates device numbers in order
-
-    MMRESULT result = midiInOpen ( &hMidiIn, midiPort, (DWORD_PTR) MidiCallback, 0, CALLBACK_FUNCTION );
-
-    if ( result != MMSYSERR_NOERROR )
+    /* Get the number of MIDI In devices in this computer */
+    iMidiDevs = midiInGetNumDevs();
+    if ( iMidiDevs > MAX_MIDI_DEVS )
     {
-        qWarning() << "! Failed to open MIDI input device. Error code: " << result;
-        hMidiIn = 0;
-        return;
+        iMidiDevs = MAX_MIDI_DEVS;
     }
 
-    result = midiInStart ( hMidiIn );
-    if ( result != MMSYSERR_NOERROR )
+    // printf("Found %d MIDI device%s\n", iMidiDevs, iMidiDevs == 1 ? "" : "s");
+
+    // open all connected MIDI devices and set the callback function to handle incoming messages
+    for ( int i = 0; i < iMidiDevs; i++ )
     {
-        qWarning() << "! Failed to start MIDI input. Error code: " << result;
-        midiInClose ( hMidiIn );
-        hMidiIn = 0;
-        return;
+        MMRESULT result = midiInOpen ( &hMidiIn[i], i, (DWORD_PTR) MidiCallback, 0, CALLBACK_FUNCTION );
+
+        if ( result != MMSYSERR_NOERROR )
+        {
+            qWarning() << "! Failed to open MIDI input device. Error code: " << result;
+            hMidiIn[i] = 0;
+            return;
+        }
+
+        result = midiInStart ( hMidiIn[i] );
+
+        if ( result != MMSYSERR_NOERROR )
+        {
+            qWarning() << "! Failed to start MIDI input. Error code: " << result;
+            midiInClose ( hMidiIn[i] );
+            hMidiIn[i] = 0;
+            return;
+        }
     }
 }
 
 void CSound::MidiStop()
 {
     // stop MIDI if running
-    if ( hMidiIn != 0 )
+    for ( int i = 0; i < iMidiDevs; i++ )
     {
-        midiInStop ( hMidiIn );
-        midiInClose ( hMidiIn );
+        if ( hMidiIn[i] != 0 )
+        {
+            midiInStop ( hMidiIn[i] );
+            midiInClose ( hMidiIn[i] );
+        }
     }
 }
 

diff --git a/src/sound/asio/sound.h b/src/sound/asio/sound.h
@@ -136,8 +136,10 @@ class CSound : public CSoundBase
     char* cDriverNames[MAX_NUMBER_SOUND_CARDS];
 
     // Windows native MIDI
-    HMIDIIN hMidiIn; // windows handle
-    UINT    midiPort;
+#define MAX_MIDI_DEVS 4
+
+    int     iMidiDevs;
+    HMIDIIN hMidiIn[MAX_MIDI_DEVS]; // windows handles
 
     void                 MidiStart();
     void                 MidiStop();