Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12214 from 1st-BrainStormer/master

Browse source 
Fix lockup when no midi devices present.
This commit is contained in:
John Conklin II 2018-01-22 11:25:46 -08:00 committed by GitHub
commit 22ee57db74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -504,7 +504,13 @@ public:
} }
if (message->message == WM_DEVICECHANGE) { if (message->message == WM_DEVICECHANGE) {
Midi::USBchanged(); // re-scan the MIDI bus const float MIN_DELTA_SECONDS = 2.0f; // de-bounce signal
static float lastTriggerTime = 0.0f;
const float deltaSeconds = secTimestampNow() - lastTriggerTime;
lastTriggerTime = secTimestampNow();
if (deltaSeconds > MIN_DELTA_SECONDS) {
Midi::USBchanged(); // re-scan the MIDI bus
}
} }
} }
return false; return false;

9
libraries/midi/src/Midi.cpp
View file

@ -163,7 +163,7 @@ void Midi::sendRawMessage(int device, int raw) {
void Midi::sendMessage(int device, int channel, int type, int note, int velocity) { void Midi::sendMessage(int device, int channel, int type, int note, int velocity) {
int message = (channel - 1) | (type << MIDI_SHIFT_STATUS); int message = (channel - 1) | (type << MIDI_SHIFT_STATUS);
if (broadcastEnabled) { if (broadcastEnabled) {
for (int i = 0; i < midihout.size(); i++) { for (int i = 1; i < midihout.size(); i++) { // Skip 0 (Microsoft GS Wavetable Synth)
if (midihout[i] != NULL) { if (midihout[i] != NULL) {
midiOutShortMsg(midihout[i], message | (note << MIDI_SHIFT_NOTE) | (velocity << MIDI_SHIFT_VELOCITY)); midiOutShortMsg(midihout[i], message | (note << MIDI_SHIFT_NOTE) | (velocity << MIDI_SHIFT_VELOCITY));
} }
@ -174,9 +174,9 @@ void Midi::sendMessage(int device, int channel, int type, int note, int velocity
} }
void Midi::sendNote(int status, int note, int velocity) { void Midi::sendNote(int status, int note, int velocity) {
for (int i = 0; i < midihout.size(); i++) { for (int i = 1; i < midihout.size(); i++) { // Skip 0 (Microsoft GS Wavetable Synth)
if (midihout[i] != NULL) { if (midihout[i] != NULL) {
midiOutShortMsg(midihout[i], status + (note << MIDI_SHIFT_NOTE) + (velocity << MIDI_SHIFT_VELOCITY)); midiOutShortMsg(midihout[i], status | (note << MIDI_SHIFT_NOTE) | (velocity << MIDI_SHIFT_VELOCITY));
} }
} }
} }
@ -283,9 +283,6 @@ void Midi::midiHardwareChange() {
Midi::Midi() { Midi::Midi() {
instance = this; instance = this;
#if defined Q_OS_WIN32
midiOutExclude.push_back("Microsoft GS Wavetable Synth"); // we don't want to hear this thing (Lags)
#endif
MidiSetup(); MidiSetup();
} }