diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-19 17:06:22 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-19 17:06:22 +0100 |
| commit | 8a3a5590231a1ef703269b6508fa2da7b45b8be9 (patch) | |
| tree | ad3a2b8435ac0067acac43d45720209d6473ad69 /drivers/winmidi/midi_driver_winmidi.cpp | |
| parent | 0246230e2b7c542f003c3c53cffc22dedc0c9c50 (diff) | |
| parent | b9fd25ea18f3e87530e1558cc377f36645fcd980 (diff) | |
| download | redot-engine-8a3a5590231a1ef703269b6508fa2da7b45b8be9.tar.gz | |
Merge pull request #86620 from fbcosentino/midi_device_id
Add MIDI controller device index to `InputEventMIDI.device` property.
Diffstat (limited to 'drivers/winmidi/midi_driver_winmidi.cpp')
| -rw-r--r-- | drivers/winmidi/midi_driver_winmidi.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/winmidi/midi_driver_winmidi.cpp b/drivers/winmidi/midi_driver_winmidi.cpp index cdbab489c4..07f0226c5d 100644 --- a/drivers/winmidi/midi_driver_winmidi.cpp +++ b/drivers/winmidi/midi_driver_winmidi.cpp @@ -36,7 +36,7 @@ void MIDIDriverWinMidi::read(HMIDIIN hMidiIn, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { if (wMsg == MIM_DATA) { - receive_input_packet((uint64_t)dwParam2, (uint8_t *)&dwParam1, 3); + receive_input_packet((int)dwInstance, (uint64_t)dwParam2, (uint8_t *)&dwParam1, 3); } } @@ -44,7 +44,7 @@ Error MIDIDriverWinMidi::open() { for (UINT i = 0; i < midiInGetNumDevs(); i++) { HMIDIIN midi_in; - MMRESULT res = midiInOpen(&midi_in, i, (DWORD_PTR)read, (DWORD_PTR)this, CALLBACK_FUNCTION); + MMRESULT res = midiInOpen(&midi_in, i, (DWORD_PTR)read, (DWORD_PTR)i, CALLBACK_FUNCTION); if (res == MMSYSERR_NOERROR) { midiInStart(midi_in); connected_sources.insert(i, midi_in); |