Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24641/src
Modified Files:
WaveTrack.cpp
Log Message:
Fix the sortin in SortClipArrayCmpFunc, which did not appear to work correctly
on VC8.
Index: WaveTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- WaveTrack.cpp 26 Mar 2007 12:51:42 -0000 1.98
+++ WaveTrack.cpp 26 Mar 2007 22:34:36 -0000 1.99
@@ -1548,7 +1548,7 @@
if (i > 0)
{
WaveClip* previousClip = clips.Item(i - 1);
-
+
if (fabs(previousClip->GetEndTime() - clip->GetStartTime())
< WAVETRACK_MERGE_POINT_TOLERANCE)
{
@@ -1671,7 +1671,10 @@
static int SortClipArrayCmpFunc(WaveClip** clip1, WaveClip** clip2)
{
- return (int)((*clip1)->GetStartTime() - (*clip2)->GetStartTime());
+ if((*clip1)->GetStartTime() < (*clip2)->GetStartTime())
+ return -1;
+ else
+ return 1;
}
void WaveTrack::FillSortedClipArray(WaveClipArray& clips)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
