SFXR: Removed conditional, moved ensuring env_length!=0 to initial calculation

This commit is contained in:
Raine M. Ekman
2015-03-21 12:05:06 +02:00
parent 898781484d
commit 0462be7afc

View File

@@ -134,16 +134,9 @@ void SfxrSynth::resetSample( bool restart )
env_stage=0;
env_time=0;
env_length[0]=(int)(s->m_attModel.value()*s->m_attModel.value()*100000.0f);
env_length[1]=(int)(s->m_holdModel.value()*s->m_holdModel.value()*100000.0f);
env_length[2]=(int)(s->m_decModel.value()*s->m_decModel.value()*100000.0f);
// These will be used as divisors later, let's avoid division by 0
for(int i = 0; i < 3; ++i)
{
env_length[i] = (env_length[i] == 0) ? 1 : env_length[i];
}
env_length[0]=(int)(s->m_attModel.value()*s->m_attModel.value()*99999.0f)+1;
env_length[1]=(int)(s->m_holdModel.value()*s->m_holdModel.value()*99999.0f)+1;
env_length[2]=(int)(s->m_decModel.value()*s->m_decModel.value()*99999.0f)+1;
fphase=pow(s->m_phaserOffsetModel.value(), 2.0f)*1020.0f;
if(s->m_phaserOffsetModel.value()<0.0f) fphase=-fphase;