ood-ports-lbsd-fork1/audio/lmms/patches/patch-src_tracks_InstrumentTrack_cpp

$OpenBSD: patch-src_tracks_InstrumentTrack_cpp,v 1.1 2017/05/04 13:57:28 espie Exp $
no separate scope -> different name

Index: src/tracks/InstrumentTrack.cpp
--- src/tracks/InstrumentTrack.cpp.orig
+++ src/tracks/InstrumentTrack.cpp
@@ -632,7 +632,7 @@ bool InstrumentTrack::play( const midiTime & _start,
 		// get all notes from the given pattern...
 		const NoteVector & notes = p->notes();
 		// ...and set our index to zero
-		NoteVector::ConstIterator it = notes.begin();
+		NoteVector::ConstIterator it2 = notes.begin();
 #if LMMS_SINGERBOT_SUPPORT
 		int note_idx = 0;
 #endif
@@ -644,10 +644,10 @@ bool InstrumentTrack::play( const midiTime & _start,
 		if( cur_start > 0 )
 		{
 			// skip notes which are posated before start-tact
-			while( it != notes.end() && ( *it )->pos() < cur_start )
+			while( it2 != notes.end() && ( *it2 )->pos() < cur_start )
 			{
 #if LMMS_SINGERBOT_SUPPORT
-				if( ( *it )->length() != 0 )
+				if( ( *it2 )->length() != 0 )
 				{
 					++note_idx;
 				}
@@ -657,8 +657,8 @@ bool InstrumentTrack::play( const midiTime & _start,
 		}
 
 		note * cur_note;
-		while( it != notes.end() &&
-					( cur_note = *it )->pos() == cur_start )
+		while( it2 != notes.end() &&
+					( cur_note = *it2 )->pos() == cur_start )
 		{
 			if( cur_note->length() != 0 )
 			{
@@ -681,7 +681,7 @@ bool InstrumentTrack::play( const midiTime & _start,
 				++note_idx;
 #endif
 			}
-			++it;
+			++it2;
 		}
 	}
 	return played_a_note;