Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix producing of NaN from Env/LFO parameter change while playing. #3761

Merged
merged 2 commits into from
Aug 12, 2017
Merged

Fix producing of NaN from Env/LFO parameter change while playing. #3761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d537ac6
Fix producing of NaN from Env/LFO parameter change while playing.
PhysSong Aug 10, 2017
667ee11
Use QMutexLocker
PhysSong Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/EnvelopeAndLfoParameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public slots:
static LfoInstances * s_lfoInstances;
bool m_used;

QMutex m_paramMutex;

FloatModel m_predelayModel;
FloatModel m_attackModel;
Expand Down
4 changes: 4 additions & 0 deletions src/core/EnvelopeAndLfoParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@ void EnvelopeAndLfoParameters::fillLevel( float * _buf, f_cnt_t _frame,
const f_cnt_t _release_begin,
const fpp_t _frames )
{
QMutexLocker m(&m_paramMutex);

if( _frame < 0 || _release_begin < 0 )
{
return;
Expand Down Expand Up @@ -402,6 +404,8 @@ void EnvelopeAndLfoParameters::loadSettings( const QDomElement & _this )

void EnvelopeAndLfoParameters::updateSampleVars()
{
QMutexLocker m(&m_paramMutex);

const float frames_per_env_seg = SECS_PER_ENV_SEGMENT *
Engine::mixer()->processingSampleRate();
// TODO: Remove the expKnobVals, time should be linear
Expand Down