allanger/paulxstretch
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 2 Activity

Use ScopedLock in a few places

Browse Source
This commit is contained in:
xenakios 2018-07-08 23:10:15 +03:00
parent e92f69e2a9
commit a47448bab0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/envelope_component.cpp
View File

@ -232,9 +232,8 @@ void EnvelopeComponent::mouseDown(const MouseEvent & ev)
int r = menu.show(); int r = menu.show();
if (r == 1) if (r == 1)
{ {
m_cs->enter(); ScopedLock locker(*m_cs);
m_envelope->ResetEnvelope(); m_envelope->ResetEnvelope();
m_cs->exit();
} }
if (r == 2) if (r == 2)
{ {
@ -374,15 +373,14 @@ bool EnvelopeComponent::keyPressed(const KeyPress & ev)
if (ev == KeyPress::deleteKey) if (ev == KeyPress::deleteKey)
{ {
m_node_to_drag = -1; m_node_to_drag = -1;
//m_envelope->ClearAllNodes(); {
m_cs->enter(); ScopedLock locker(*m_cs);
m_envelope->removePointsConditionally([](const envelope_node& pt) { return pt.Status == 1; }); m_envelope->removePointsConditionally([](const envelope_node& pt) { return pt.Status == 1; });
if (m_envelope->GetNumNodes() == 0) if (m_envelope->GetNumNodes() == 0)
m_envelope->AddNode({ 0.0,0.5 }); m_envelope->AddNode({ 0.0,0.5 });
m_cs->exit(); }
repaint(); repaint();
OnEnvelopeEdited(m_envelope.get()); OnEnvelopeEdited(m_envelope.get());
return true; return true;
} }
return false; return false;