Merge pull request #2877 from serdnab/sf2sustain-rev

Revision to a previous PR. midi sustain of sf2 player
LMMS · Jun 29, 2016 · ab5bc38 · ab5bc38
2 parents 0789311 + 66b6a64
commit ab5bc38
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
@@ -576,11 +576,15 @@ void sf2Instrument::playNote( NotePlayHandle * _n, sampleFrame * )
 		m_playingNotes.append( _n );
 		m_playingNotesMutex.unlock();
 	}
-	else if( _n->isReleased() ) // note is released during this period
+	else if( _n->isReleased() && ! _n->instrumentTrack()->isSustainPedalPressed() ) // note is released during this period
 	{
 		SF2PluginData * pluginData = static_cast<SF2PluginData *>( _n->m_pluginData );
 		pluginData->offset = _n->framesBeforeRelease();
 		pluginData->isNew = false;
+
+		m_playingNotesMutex.lock();
+		m_playingNotes.append( _n );
+		m_playingNotesMutex.unlock();
 	}
 }