Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1479
Modified Files:
Menus.cpp
Log Message:
Fix by Al Dimond for P2 "''Edit > Cut removes too much audio when label track
included in selection.'''
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -d -r1.527 -r1.528
--- Menus.cpp 20 Sep 2009 19:06:04 -0000 1.527
+++ Menus.cpp 17 Oct 2009 09:05:16 -0000 1.528
@@ -2931,7 +2931,7 @@
void AudacityProject::OnCut()
{
- TrackListIterator iter(mTracks);
+ TrackAndGroupIterator iter(mTracks);
Track *n = iter.First();
Track *dest;
@@ -3003,7 +3003,12 @@
break;
}
}
- n = iter.Next();
+ // Selected wave and label tracks may need group iteration
+ if (IsSticky() && n->GetSelected() &&
+ (n->GetKind() == Track::Wave || n->GetKind() == Track::Label))
+ n = iter.NextGroup();
+ else
+ n = iter.Next();
}
msClipLen = (mViewInfo.sel1 - mViewInfo.sel0);
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
