Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1741
Modified Files:
Menus.cpp ShuttleGui.cpp TrackArtist.cpp TrackPanel.cpp
Log Message:
Fixing problems found during static analysis (VS Team System code analysis).
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -d -r1.486 -r1.487
--- Menus.cpp 1 Jun 2009 05:43:40 -0000 1.486
+++ Menus.cpp 2 Jun 2009 05:03:15 -0000 1.487
@@ -2648,7 +2648,7 @@
TrackListIterator iter(mTracks);
Track *t = iter.First();
int numNoteTracksSelected = 0;
- NoteTrack *nt;
+ NoteTrack *nt = NULL;
// Iterate through once to make sure that there is
// exactly one NoteTrack selected.
Index: TrackArtist.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- TrackArtist.cpp 25 May 2009 11:14:57 -0000 1.149
+++ TrackArtist.cpp 2 Jun 2009 05:03:15 -0000 1.150
@@ -842,7 +842,7 @@
if (bl[x] <= -1) {
if (drawStripes) {
// TODO:unify with buffer drawing.
- dc.SetPen(bl[x] % 2 ? muteSamplePen : samplePen);
+ dc.SetPen((bl[x] % 2) ? muteSamplePen : samplePen);
for (int y = 0; y < r.height / 25 + 1; y++) {
// we are drawing over the buffer, but I think DrawLine takes
care of this.
AColor::Line(dc,
Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -d -r1.456 -r1.457
--- TrackPanel.cpp 1 Jun 2009 05:43:40 -0000 1.456
+++ TrackPanel.cpp 2 Jun 2009 05:03:15 -0000 1.457
@@ -5140,28 +5140,28 @@
}
tSelected = t->GetSelected();
pSelected = p->GetSelected();
- if( tSelected & pSelected )
+ if( tSelected && pSelected )
{
mTracks->Select( t, false );
SetFocusedTrack( p ); // move focus to next track down
EnsureVisible( p );
return;
}
- if( tSelected & !pSelected )
+ if( tSelected && !pSelected )
{
mTracks->Select( p, true );
SetFocusedTrack( p ); // move focus to next track down
EnsureVisible( p );
return;
}
- if( !tSelected & pSelected )
+ if( !tSelected && pSelected )
{
mTracks->Select( p, false );
SetFocusedTrack( p ); // move focus to next track down
EnsureVisible( p );
return;
}
- if( !tSelected & !pSelected )
+ if( !tSelected && !pSelected )
{
mTracks->Select( t, true );
SetFocusedTrack( p ); // move focus to next track down
@@ -5239,28 +5239,28 @@
}
tSelected = t->GetSelected();
nSelected = n->GetSelected();
- if( tSelected & nSelected )
+ if( tSelected && nSelected )
{
mTracks->Select( t, false );
SetFocusedTrack( n ); // move focus to next track down
EnsureVisible( n );
return;
}
- if( tSelected & !nSelected )
+ if( tSelected && !nSelected )
{
mTracks->Select( n, true );
SetFocusedTrack( n ); // move focus to next track down
EnsureVisible( n );
return;
}
- if( !tSelected & nSelected )
+ if( !tSelected && nSelected )
{
mTracks->Select( n, false );
SetFocusedTrack( n ); // move focus to next track down
EnsureVisible( n );
return;
}
- if( !tSelected & !nSelected )
+ if( !tSelected && !nSelected )
{
mTracks->Select( t, true );
SetFocusedTrack( n ); // move focus to next track down
Index: ShuttleGui.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/ShuttleGui.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ShuttleGui.cpp 24 May 2009 17:25:16 -0000 1.44
+++ ShuttleGui.cpp 2 Jun 2009 05:03:15 -0000 1.45
@@ -1667,7 +1667,7 @@
{
wxChoice * pChoice=(wxChoice*)NULL;
- int TempIndex;
+ int TempIndex=0;
int TranslatedInt = Default;
WrappedType WrappedRef( TranslatedInt );
// Get from prefs does 1 and 2.
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
