mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

MidiKeyboardComponent: Fix potential data race on shouldCheckState data member

Browse source
This commit is contained in:
reuk 2021-09-01 17:21:43 +01:00
parent ea250b3655
commit ac3d1b7539
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp
View file

@ -195,7 +195,7 @@ void MidiKeyboardComponent::setMidiChannel (int midiChannelNumber)
void MidiKeyboardComponent::setMidiChannelsToDisplay (int midiChannelMask)
{
midiInChannelMask = midiChannelMask;
shouldCheckState = true;
noPendingUpdates.store (false);
}
void MidiKeyboardComponent::setVelocity (float v, bool useMousePosition)
@ -668,12 +668,12 @@ void MidiKeyboardComponent::resized()
//==============================================================================
void MidiKeyboardComponent::handleNoteOn (MidiKeyboardState*, int /*midiChannel*/, int /*midiNoteNumber*/, float /*velocity*/)
{
shouldCheckState = true; // (probably being called from the audio thread, so avoid blocking in here)
noPendingUpdates.store (false);
}
void MidiKeyboardComponent::handleNoteOff (MidiKeyboardState*, int /*midiChannel*/, int /*midiNoteNumber*/, float /*velocity*/)
{
shouldCheckState = true; // (probably being called from the audio thread, so avoid blocking in here)
noPendingUpdates.store (false);
}
//==============================================================================
@ -809,19 +809,17 @@ void MidiKeyboardComponent::mouseWheelMove (const MouseEvent&, const MouseWheelD
void MidiKeyboardComponent::timerCallback()
{
if (shouldCheckState)
if (noPendingUpdates.exchange (true))
return;
for (int i = rangeStart; i <= rangeEnd; ++i)
{
shouldCheckState = false;
bool isOn = state.isNoteOnForChannels (midiInChannelMask, i);
for (int i = rangeStart; i <= rangeEnd; ++i)
if (keysCurrentlyDrawnDown[i] != isOn)
{
bool isOn = state.isNoteOnForChannels (midiInChannelMask, i);
if (keysCurrentlyDrawnDown[i] != isOn)
{
keysCurrentlyDrawnDown.setBit (i, isOn);
repaintNote (i);
}
keysCurrentlyDrawnDown.setBit (i, isOn);
repaintNote (i);
}
}
}

2
modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.h
View file

@ -413,7 +413,7 @@ private:
Array<int> mouseOverNotes, mouseDownNotes;
BigInteger keysPressed, keysCurrentlyDrawnDown;
bool shouldCheckState = false;
std::atomic<bool> noPendingUpdates { true };
int rangeStart = 0, rangeEnd = 127;
float firstKey = 12 * 4.0f;