diff options
| author | joerg <joerg@pkgsrc.org> | 2012-07-03 18:19:53 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-07-03 18:19:53 +0000 |
| commit | 1248504d5f0c0ec0bcdbad6f68e52e208d0ce977 (patch) | |
| tree | 34c7a1d20797117fb021c336834671383f9e97f7 /audio/lmms | |
| parent | daf2410fc14056956b692b523845b6bcec2993ed (diff) | |
| download | pkgsrc-1248504d5f0c0ec0bcdbad6f68e52e208d0ce977.tar.gz | |
Don't shadow one local variable with another
Diffstat (limited to 'audio/lmms')
| -rw-r--r-- | audio/lmms/distinfo | 3 | ||||
| -rw-r--r-- | audio/lmms/patches/patch-src_tracks_instrument__track.cpp | 53 |
2 files changed, 55 insertions, 1 deletions
diff --git a/audio/lmms/distinfo b/audio/lmms/distinfo index b211961b249..ccbe07ade20 100644 --- a/audio/lmms/distinfo +++ b/audio/lmms/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2006/10/10 20:13:48 rillig Exp $ +$NetBSD: distinfo,v 1.4 2012/07/03 18:19:53 joerg Exp $ SHA1 (lmms-0.2.0.tar.bz2) = 410647c860d140769ed1c56bb8a794cb2594658b RMD160 (lmms-0.2.0.tar.bz2) = c3e44e018303ed40d048542a8f66fbb785ea11f2 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = f9be78b4c606e80c8b0bad78fafbd8ee07f2e65e SHA1 (patch-ad) = b62e49823415530354a01c43fc588338212aaf68 SHA1 (patch-ae) = de50ed87888b74a0d3ed0158dda3291af54595c9 SHA1 (patch-af) = c269ade81ba2e9951df18a9a04e2978572376e74 +SHA1 (patch-src_tracks_instrument__track.cpp) = 9b1b3df91bd306d5f7d8d7a24b03fe6d2ec13afa diff --git a/audio/lmms/patches/patch-src_tracks_instrument__track.cpp b/audio/lmms/patches/patch-src_tracks_instrument__track.cpp new file mode 100644 index 00000000000..a8277a6221a --- /dev/null +++ b/audio/lmms/patches/patch-src_tracks_instrument__track.cpp @@ -0,0 +1,53 @@ +$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 ); |