Update two NotePlayHandle methods to ignore child NotePlayHandles

Fastigium · Fastigium · commit eec7f634a866 · 2016-02-23T10:36:35.000+01:00
The methods NotePlayHandle::index and NotePlayHandle::nphsOfInstrumentTrack
had not yet been brought up-to-date with the new system of attaching child
NotePlayHandles directly to the mixer. This caused strange glitches when
arpeggio was used in sort mode.
diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h
@@ -206,11 +206,13 @@ class EXPORT NotePlayHandle : public PlayHandle, public Note
 	void mute();
 
 	/*! Returns index of NotePlayHandle in vector of note-play-handles
-        belonging to this instrument track - used by arpeggiator */
+	    belonging to this instrument track - used by arpeggiator.
+	    Ignores child note-play-handles, returns -1 when called on one */
 	int index() const;
 
-	/*! returns list of note-play-handles belonging to given instrument track,
-	    if allPlayHandles = true, also released note-play-handles are returned */
+	/*! Returns list of note-play-handles belonging to given instrument track.
+	    If allPlayHandles = true, also released note-play-handles and children
+	    are returned */
 	static ConstNotePlayHandleList nphsOfInstrumentTrack( const InstrumentTrack* Track, bool allPlayHandles = false );
 
 	/*! Returns whether given NotePlayHandle instance is equal to *this */
diff --git a/src/core/NotePlayHandle.cpp b/src/core/NotePlayHandle.cpp
@@ -449,17 +449,17 @@ int NotePlayHandle::index() const
 	for( PlayHandleList::ConstIterator it = playHandles.begin(); it != playHandles.end(); ++it )
 	{
 		const NotePlayHandle * nph = dynamic_cast<const NotePlayHandle *>( *it );
-		if( nph == NULL || nph->m_instrumentTrack != m_instrumentTrack || nph->isReleased() )
+		if( nph == NULL || nph->m_instrumentTrack != m_instrumentTrack || nph->isReleased() || nph->hasParent() )
 		{
 			continue;
 		}
 		if( nph == this )
 		{
-			break;
+			return idx;
 		}
 		++idx;
 	}
-	return idx;
+	return -1;
 }
 
 
@@ -473,7 +473,7 @@ ConstNotePlayHandleList NotePlayHandle::nphsOfInstrumentTrack( const InstrumentT
 	for( PlayHandleList::ConstIterator it = playHandles.begin(); it != playHandles.end(); ++it )
 	{
 		const NotePlayHandle * nph = dynamic_cast<const NotePlayHandle *>( *it );
-		if( nph != NULL && nph->m_instrumentTrack == _it && ( nph->isReleased() == false || _all_ph == true ) )
+		if( nph != NULL && nph->m_instrumentTrack == _it && ( ( nph->isReleased() == false && nph->hasParent() == false ) || _all_ph == true ) )
 		{
 			cnphv.push_back( nph );
 		}

Original file line number	Diff line number	Diff line change
`@@ -449,17 +449,17 @@ int NotePlayHandle::index() const`
`449`	`449`	`for( PlayHandleList::ConstIterator it = playHandles.begin(); it != playHandles.end(); ++it )`
`450`	`450`	`{`
`451`	`451`	`const NotePlayHandle * nph = dynamic_cast<const NotePlayHandle >( it );`
`452`		`- if( nph == NULL \|\| nph->m_instrumentTrack != m_instrumentTrack \|\| nph->isReleased() )`
	`452`	`+ if( nph == NULL \|\| nph->m_instrumentTrack != m_instrumentTrack \|\| nph->isReleased() \|\| nph->hasParent() )`
`453`	`453`	`{`
`454`	`454`	`continue;`
`455`	`455`	`}`
`456`	`456`	`if( nph == this )`
`457`	`457`	`{`
`458`		`- break;`
	`458`	`+ return idx;`
`459`	`459`	`}`
`460`	`460`	`++idx;`
`461`	`461`	`}`
`462`		`- return idx;`
	`462`	`+ return -1;`
`463`	`463`	`}`
`464`	`464`
`465`	`465`
`@@ -473,7 +473,7 @@ ConstNotePlayHandleList NotePlayHandle::nphsOfInstrumentTrack( const InstrumentT`
`473`	`473`	`for( PlayHandleList::ConstIterator it = playHandles.begin(); it != playHandles.end(); ++it )`
`474`	`474`	`{`
`475`	`475`	`const NotePlayHandle * nph = dynamic_cast<const NotePlayHandle >( it );`
`476`		`- if( nph != NULL && nph->m_instrumentTrack == _it && ( nph->isReleased() == false \|\| _all_ph == true ) )`
	`476`	`+ if( nph != NULL && nph->m_instrumentTrack == _it && ( ( nph->isReleased() == false && nph->hasParent() == false ) \|\| _all_ph == true ) )`
`477`	`477`	`{`
`478`	`478`	`cnphv.push_back( nph );`
`479`	`479`	`}`