head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.1.0.6
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.4
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.2
	pkgsrc-2012Q3-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2013.06.17.15.16.47;	author ryoon;	state dead;
branches;
next	1.1;
commitid	AQ0PpULdXWo4RYTw;

1.1
date	2012.07.03.18.19.53;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 0.4.15

* Update dependencies.
* Use cmake instead of configure.
* Use qt4 instead of qt3.
* Set LICENSE.

Changelog:
* Many GUI improvements.
* Translation updates.
* Many new features.
* Bugfixes.
@
text
@$NetBSD: patch-src_tracks_instrument__track.cpp,v 1.1 2012/07/03 18:19:53 joerg Exp $

--- src/tracks/instrument_track.cpp.orig	2012-07-03 15:40:56.000000000 +0000
+++ src/tracks/instrument_track.cpp
@@@@ -946,7 +946,7 @@@@ bool FASTCALL instrumentTrack::play( con
 		// get all notes from the given pattern...
 		noteVector & notes = p->notes();
 		// ...and set our index to zero
-		noteVector::iterator it = notes.begin();
+		noteVector::iterator it2 = notes.begin();
 
 		// very effective algorithm for playing notes that are
 		// posated within the current sample-frame
@@@@ -955,23 +955,23 @@@@ bool FASTCALL instrumentTrack::play( con
 		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 )
 			{
-				++it;
+				++it2;
 			}
 		}
 
 		// skip notes before sample-frame
-		while( it != notes.end() &&
-			( *it )->pos( cur_start ).frames( frames_per_tact ) <
+		while( it2 != notes.end() &&
+			( *it2 )->pos( cur_start ).frames( frames_per_tact ) <
 								_start_frame )
 		{
-			++it;
+			++it2;
 		}
 
 		note * cur_note;
-		while( it != notes.end() &&
-			( ( cur_note = *it )->pos( cur_start ).frames(
+		while( it2 != notes.end() &&
+			( ( cur_note = *it2 )->pos( cur_start ).frames(
 					frames_per_tact ) ) <= end_frame )
 		{
 			if( cur_note->length() != 0 )
@@@@ -1024,7 +1024,7 @@@@ bool FASTCALL instrumentTrack::play( con
 				}
 				played_a_note = TRUE;
 			}
-			++it;
+			++it2;
 		}
 	}
 	return( played_a_note );
@


1.1
log
@Don't shadow one local variable with another
@
text
@d1 1
a1 1
$NetBSD$
@