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

Merge pull request #418 from diizy/stable-0.4

Browse Source 
AutomationPattern: fix values after last value
This commit is contained in:
Tobias Doerffel
2014-03-06 13:29:24 +01:00
parent 0b387b0f72 eb81e6b9d6
commit 0b0d905214
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/AutomationPattern.cpp
View File

@@ -163,17 +163,10 @@ const AutomatableModel * AutomationPattern::firstObject() const
//TODO: Improve this
MidiTime AutomationPattern::length() const
{
tick_t max_length = 0;
for( timeMap::const_iterator it = m_timeMap.begin();
it != m_timeMap.end(); ++it )
{
max_length = qMax<tick_t>( max_length, it.key() );
}
return MidiTime( qMax( MidiTime( max_length ).getTact() + 1, 1 ), 0 );
timeMap::const_iterator it = m_timeMap.end();
return MidiTime( qMax( MidiTime( (it-1).key() ).getTact() + 1, 1 ), 0 );
}
@@ -313,6 +306,10 @@ float AutomationPattern::valueAt( const MidiTime & _time ) const
{
return 0;
}
if( v == m_timeMap.end() )
{
return (v-1).value();
}
return valueAt( v-1, _time - (v-1).key() );
}