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

Merge pull request #992 from LMMS/stable-1.1

Browse Source 
sync
This commit is contained in:
Vesa V
2014-07-14 23:48:55 +03:00
parent 921943bce1 dbb1418ad6
commit 2e480c948a
3 changed files with 29 additions and 47 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;

18
src/core/Mixer.cpp
View File

@@ -519,14 +519,7 @@ float Mixer::peakValueLeft( sampleFrame * _ab, const f_cnt_t _frames )
float p = 0.0f;
for( f_cnt_t f = 0; f < _frames; ++f )
{
if( _ab[f][0] > p )
{
p = _ab[f][0];
}
else if( -_ab[f][0] > p )
{
p = -_ab[f][0];
}
p = qMax( p, qAbs( _ab[f][0] ) );
}
return p;
}
@@ -539,14 +532,7 @@ float Mixer::peakValueRight( sampleFrame * _ab, const f_cnt_t _frames )
float p = 0.0f;
for( f_cnt_t f = 0; f < _frames; ++f )
{
if( _ab[f][1] > p )
{
p = _ab[f][1];
}
else if( -_ab[f][1] > p )
{
p = -_ab[f][1];
}
p = qMax( p, qAbs( _ab[f][1] ) );
}
return p;
}

38
src/tracks/pattern.cpp
View File

@@ -853,27 +853,27 @@ void patternView::wheelEvent( QWheelEvent * _we )
{
vol = n->getVolume();
len = n->length();
}
if( len == 0 && _we->delta() > 0 )
{
n->setLength( -DefaultTicksPerTact );
n->setVolume( 5 );
}
else if( _we->delta() > 0 )
{
n->setVolume( qMin( 100, vol + 5 ) );
}
else
{
n->setVolume( qMax( 0, vol - 5 ) );
}
if( len == 0 && _we->delta() > 0 )
{
n->setLength( -DefaultTicksPerTact );
n->setVolume( 5 );
}
else if( _we->delta() > 0 )
{
n->setVolume( qMin( 100, vol + 5 ) );
}
else
{
n->setVolume( qMax( 0, vol - 5 ) );
}
engine::getSong()->setModified();
update();
if( engine::pianoRoll()->currentPattern() == m_pat )
{
engine::pianoRoll()->update();
engine::getSong()->setModified();
update();
if( engine::pianoRoll()->currentPattern() == m_pat )
{
engine::pianoRoll()->update();
}
}
_we->accept();
}