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

Merge pull request #990 from diizy/stable-1.1

Browse Source 
InstrumentSoundShaping: ensure that release time is never longer than th...
This commit is contained in:
Vesa V
2014-07-14 18:41:51 +03:00
parent 1eed43c55e 8a35a57efa
commit 6c72804aa4
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/InstrumentSoundShaping.cpp
View File

@@ -315,23 +315,19 @@ f_cnt_t InstrumentSoundShaping::envFrames( const bool _only_vol ) const
f_cnt_t InstrumentSoundShaping::releaseFrames() const
{
f_cnt_t ret_val = m_envLfoParameters[Volume]->isUsed() ?
m_envLfoParameters[Volume]->releaseFrames() : 0;
if( m_instrumentTrack->instrument() &&
m_instrumentTrack->instrument()->desiredReleaseFrames() > ret_val )
if( m_envLfoParameters[Volume]->isUsed() )
{
ret_val = m_instrumentTrack->instrument()->desiredReleaseFrames();
return m_envLfoParameters[Volume]->releaseFrames();
}
f_cnt_t ret_val = m_instrumentTrack->instrument()
? m_instrumentTrack->instrument()->desiredReleaseFrames()
: 0;
if( m_envLfoParameters[Volume]->isUsed() == false )
for( int i = Volume+1; i < NumTargets; ++i )
{
for( int i = Volume+1; i < NumTargets; ++i )
if( m_envLfoParameters[i]->isUsed() )
{
if( m_envLfoParameters[i]->isUsed() &&
m_envLfoParameters[i]->releaseFrames() > ret_val )
{
ret_val = m_envLfoParameters[i]->releaseFrames();
}
ret_val = qMax( ret_val, m_envLfoParameters[i]->releaseFrames() );
}
}
return ret_val;