hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #913 from LMMS/stable-1.1

Browse Source 
Syncing...
This commit is contained in:
Vesa V
2014-06-30 12:49:02 +03:00
parent a7bb31159e 4143fc95e4
commit 9c8c80683b
8 changed files with 976 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/monstro/Monstro.cpp
View File

@@ -921,7 +921,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
// envelope 1
// adjust phase for release
if( m_nph->isReleased() && m_env1_phase < 4.0f )
if( m_env1_phase < 4.0f && m_nph->isReleased() && f >= m_nph->framesBeforeRelease() )
{
if( m_env1_phase < 1.0f ) m_env1_phase = 5.0f;
else if( m_env1_phase < 2.0f ) m_env1_phase = 5.0f - fraction( m_env1_phase );
@@ -973,7 +973,7 @@ void MonstroSynth::renderModulators( fpp_t _frames )
// adjust phase for release
if( m_nph->isReleased() && m_env2_phase < 4.0f )
if( m_env2_phase < 4.0f && m_nph->isReleased() && f >= m_nph->framesBeforeRelease() )
{
if( m_env2_phase < 1.0f ) m_env2_phase = 5.0f;
else if( m_env2_phase < 2.0f ) m_env2_phase = 5.0f - fraction( m_env2_phase );