Skip to content

Commit 6034875

Browse files
authored
Merge pull request #2786 from Holzhaus/ignore-midi-clock
controllers/midi/midicontroller: Ignore MIDI clock messages (0xF8)
2 parents c6489c7 + 8615ea9 commit 6034875

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

CHANGELOG

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* Add controller mapping for Stanton DJC.4 #2607
1818
* Fix broadcasting via broadcast/recording input lp:1876222 #2743
1919
* Only apply ducking gain in manual ducking mode when talkover is enabed lp:1394968 lp:1737113 lp:1662536 #2759
20+
* Ignore MIDI Clock Messages (0xF8) because they are not usable in Mixxx and inhibited the screensaver #2786
2021

2122
==== 2.2.3 2019-11-24 ====
2223

src/controllers/midi/midicontroller.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,16 @@ void MidiController::receive(unsigned char status, unsigned char control,
203203
unsigned char channel = MidiUtils::channelFromStatus(status);
204204
unsigned char opCode = MidiUtils::opCodeFromStatus(status);
205205

206+
// Ignore MIDI beat clock messages (0xF8) until we have proper MIDI sync in
207+
// Mixxx. These messages are not suitable to use in JS anyway, as they are
208+
// sent at 24 ppqn (i.e. one message every 20.83 ms for a 120 BPM track)
209+
// and require real-time code. Currently, they are only spam on the
210+
// console, inhibit the screen saver unintentionally, could potentially
211+
// slow down Mixxx or interfere with the learning wizard.
212+
if (status == 0xF8) {
213+
return;
214+
}
215+
206216
controllerDebug(MidiUtils::formatMidiMessage(getName(), status, control, value,
207217
channel, opCode, timestamp));
208218
MidiKey mappingKey(status, control);

0 commit comments

Comments
 (0)