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

NotePlayHandle: only use detuning automation if it exists at all

Browse Source
This commit is contained in:
Tobias Doerffel
2014-01-20 23:36:38 +01:00
parent 80b8e91fd1
commit 2bc8d12826
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/note_play_handle.h
View File

@@ -233,7 +233,6 @@ private:
private:
DetuningHelper * m_detuning;
float m_value;
} ;

10
src/core/note_play_handle.cpp
View File

@@ -34,8 +34,7 @@
notePlayHandle::BaseDetuning::BaseDetuning( DetuningHelper *detuning ) :
m_detuning( detuning ),
m_value( m_detuning->automationPattern()->valueAt( 0 ) )
m_value( detuning ? detuning->automationPattern()->valueAt( 0 ) : 0 )
{
}
@@ -503,12 +502,11 @@ void notePlayHandle::updateFrequency()
void notePlayHandle::processMidiTime( const midiTime & _time )
void notePlayHandle::processMidiTime( const midiTime& time )
{
if( _time >= songGlobalParentOffset()+pos() )
if( detuning() && time >= songGlobalParentOffset()+pos() )
{
const float v = detuning()->automationPattern()->
valueAt( _time - songGlobalParentOffset() - pos() );
const float v = detuning()->automationPattern()->valueAt( time - songGlobalParentOffset() - pos() );
if( !typeInfo<float>::isEqual( v, m_baseDetuning->value() ) )
{
m_baseDetuning->setValue( v );