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

Merge pull request #849 from diizy/mixeriph2

Browse Source 
A fix to IPH waiting code: don't wait for already finished notes, plus a...
This commit is contained in:
Vesa V
2014-06-13 19:50:45 +03:00
parent 66c05f60ff a0d6115482
commit dd13b26696
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/InstrumentPlayHandle.h
View File

@@ -56,14 +56,21 @@ public:
// if not, we need to ensure that all our nph's have been processed first
ConstNotePlayHandleList nphv = NotePlayHandle::nphsOfInstrumentTrack( m_instrument->instrumentTrack(), true );
foreach( const NotePlayHandle * cnph, nphv )
bool nphsLeft;
do
{
NotePlayHandle * nph = const_cast<NotePlayHandle *>( cnph );
while( nph->state() != ThreadableJob::Done )
nphsLeft = false;
foreach( const NotePlayHandle * cnph, nphv )
{
nph->process();
NotePlayHandle * nph = const_cast<NotePlayHandle *>( cnph );
if( nph->state() != ThreadableJob::Done && ! nph->isFinished() )
{
nphsLeft = true;
nph->process();
}
}
}
while( nphsLeft );
m_instrument->play( _working_buffer );
}