Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1461
Modified Files:
WaveTrack.cpp
Log Message:
cleaning up uncertain placeholder comments, cleaning up mOffset usage (no
longer write WaveTrack::mOffset to xml on save.
Index: WaveTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- WaveTrack.cpp 22 Aug 2009 21:49:10 -0000 1.165
+++ WaveTrack.cpp 23 Aug 2009 11:22:28 -0000 1.166
@@ -1462,7 +1462,6 @@
xmlFile.WriteAttr(wxT("name"), mName);
xmlFile.WriteAttr(wxT("channel"), mChannel);
xmlFile.WriteAttr(wxT("linked"), mLinked);
- xmlFile.WriteAttr(wxT("offset"), mOffset, 8);
xmlFile.WriteAttr(wxT("mute"), mMute);
xmlFile.WriteAttr(wxT("solo"), mSolo);
xmlFile.WriteAttr(wxT("height"), this->GetActualHeight());
@@ -1963,10 +1962,8 @@
return false;
}
- //mchinen 22.8.09 - This mOffset subtraction causes a bug for
subsequent splits after a split new-
- //We should be wary of this, but it appears GetStartTime and mOffset
are identical
- //if WaveTrack::SetOffset is called (as in
AudacityProject::OnSplitNew())
- sampleCount here = llrint(floor(((t - c->GetStartTime()/* -
mOffset*/) * mRate) + 0.5));
+ //offset the new clip by the splitpoint (noting that it is already
offset to c->GetStartTime())
+ sampleCount here = llrint(floor(((t - c->GetStartTime()) * mRate) +
0.5));
newClip->Offset((double)here/(double)mRate);
mClips.Append(newClip);
return true;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
