Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3882/src
Modified Files:
AboutDialog.cpp BatchCommands.cpp CrossFade.cpp
Dependencies.cpp Mix.cpp Project.cpp Snap.cpp TrackArtist.cpp
TrackPanel.cpp UndoManager.cpp WaveClip.cpp WaveTrack.cpp
WaveTrack.h
Log Message:
Reworked and applied patch (against HEAD) from Michal Seben to use
::compatibility_iterator instead of ::Node.
Index: Mix.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Mix.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- Mix.cpp 1 Apr 2009 04:58:12 -0000 1.77
+++ Mix.cpp 20 Apr 2009 17:27:22 -0000 1.78
@@ -335,7 +335,7 @@
// Find the last sample
sampleCount last = -1;
- WaveClipList::Node* it = track->GetClipIterator();
+ WaveClipList::compatibility_iterator it = track->GetClipIterator();
while (it) {
sampleCount end = it->GetData()->GetEndSample();
if (end > last) {
Index: AboutDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- AboutDialog.cpp 6 Apr 2009 23:21:44 -0000 1.68
+++ AboutDialog.cpp 20 Apr 2009 17:27:22 -0000 1.69
@@ -815,7 +815,7 @@
{
wxString s;
- for (AboutDialogCreditItemsList::Node* p=creditItems.GetFirst(); p; p =
p->GetNext())
+ for (AboutDialogCreditItemsList::compatibility_iterator
p=creditItems.GetFirst(); p; p = p->GetNext())
{
AboutDialogCreditItem* item = p->GetData();
if (item->role == role)
Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -d -r1.445 -r1.446
--- TrackPanel.cpp 20 Apr 2009 02:33:02 -0000 1.445
+++ TrackPanel.cpp 20 Apr 2009 17:27:22 -0000 1.446
@@ -2224,7 +2224,7 @@
while (t) {
if (t->GetKind() == Track::Wave) {
WaveTrack *wt = (WaveTrack *)t;
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
for (it = wt->GetClipIterator(); it; it = it->GetNext()) {
WaveClip *clip = it->GetData();
double clip0 = clip->GetStartTime();
@@ -2249,7 +2249,7 @@
if (t->GetSelected()) {
if (t->GetKind() == Track::Wave) {
WaveTrack *wt = (WaveTrack *)t;
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
for (it = wt->GetClipIterator(); it; it = it->GetNext()) {
WaveClip *clip = it->GetData();
double clip0 = clip->GetStartTime();
@@ -2276,7 +2276,7 @@
while (t) {
if (t->GetKind() == Track::Wave) {
WaveTrack *wt = (WaveTrack *)t;
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
for (it = wt->GetClipIterator(); it; it = it->GetNext()) {
WaveClip *clip = it->GetData();
mCapturedClipArray.Add(TrackClip(wt, clip));
Index: WaveTrack.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- WaveTrack.h 30 Mar 2009 06:16:48 -0000 1.66
+++ WaveTrack.h 20 Apr 2009 17:27:22 -0000 1.67
@@ -246,7 +246,7 @@
// Get access to the clips in the tracks. This is used by
// track artists and also by TrackPanel when sliding...it would
// be cleaner if this could be removed, though...
- WaveClipList::Node* GetClipIterator() { return mClips.GetFirst(); }
+ WaveClipList::compatibility_iterator GetClipIterator() { return
mClips.GetFirst(); }
// Create new clip and add it to this track. Returns a pointer
// to the newly created clip.
Index: BatchCommands.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/BatchCommands.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- BatchCommands.cpp 23 Mar 2009 00:32:53 -0000 1.33
+++ BatchCommands.cpp 20 Apr 2009 17:27:22 -0000 1.34
@@ -251,7 +251,7 @@
// Gets all commands that are valid for this mode.
wxArrayString BatchCommands::GetAllCommands()
{
- wxArrayString commands(true);
+ wxArrayString commands;
wxString command;
commands.Clear();
Index: WaveTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- WaveTrack.cpp 5 Apr 2009 22:52:22 -0000 1.148
+++ WaveTrack.cpp 20 Apr 2009 17:27:22 -0000 1.149
@@ -99,7 +99,7 @@
Init(orig);
- for (WaveClipList::Node *node = orig.mClips.GetFirst(); node; node =
node->GetNext())
+ for (WaveClipList::compatibility_iterator node = orig.mClips.GetFirst();
node; node = node->GetNext())
mClips.Append(new WaveClip(*node->GetData(), mDirManager));
}
@@ -135,7 +135,7 @@
if(ODManager::IsInstanceCreated())
ODManager::Instance()->RemoveWaveTrack(this);
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
delete it->GetData();
mClips.Clear();
if (mDisplayLocations)
@@ -152,7 +152,7 @@
{
double delta = o - GetOffset();
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* clip = it->GetData();
clip->SetOffset(clip->GetOffset() + delta);
@@ -186,7 +186,7 @@
void WaveTrack::SetRate(double newRate)
{
mRate = (int) newRate;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
it->GetData()->SetRate((int) newRate);
}
@@ -233,7 +233,7 @@
bool WaveTrack::ConvertToSampleFormat(sampleFormat format)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
it->GetData()->ConvertToSampleFormat(format);
mFormat = format;
@@ -242,7 +242,7 @@
bool WaveTrack::IsEmpty(double t0, double t1)
{
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
//printf("Searching for overlap in %.6f...%.6f\n", t0, t1);
for (it=GetClipIterator(); it; it=it->GetNext())
@@ -309,7 +309,7 @@
// the left selection t0.
double firstGreaterOffset = -1;
- WaveClipList::Node * it;
+ WaveClipList::compatibility_iterator it;
for(it = GetClipIterator(); it; it = it->GetNext())
{
@@ -370,7 +370,7 @@
newTrack->Init(*this);
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
for (it=GetClipIterator(); it; it=it->GetNext())
{
@@ -478,8 +478,8 @@
Track *src,
bool preserve, bool merge)
{
- WaveClipList::Node* ic;
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator ic;
+ WaveClipList::compatibility_iterator it;
double dur = wxMin(t1 - t0, src->GetEndTime());
wxArrayDouble splits;
WaveClipArray cuts;
@@ -512,7 +512,7 @@
WaveClipList* cutlines = clip->GetCutLines();
it = cutlines->GetFirst();
while (it) {
- WaveClipList::Node* in = it->GetNext();
+ WaveClipList::compatibility_iterator in = it->GetNext();
WaveClip *cut = it->GetData();
double cs = LongSamplesToTime(TimeToLongSamples(clip->GetOffset() +
cut->GetOffset()));
@@ -680,7 +680,7 @@
bool editClipCanMove = true;
gPrefs->Read(wxT("/GUI/EditClipCanMove"), &editClipCanMove);
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
WaveClipList clipsToDelete;
WaveClipList clipsToAdd;
@@ -895,7 +895,7 @@
//printf("paste: we have at least one clip\n");
double insertDuration = other->GetEndTime();
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
//printf("Check if we need to make room for the pasted data\n");
@@ -1020,7 +1020,7 @@
sampleCount len = (sampleCount)floor(t1 * mRate + 0.5) - start;
bool result = true;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip *clip = it->GetData();
@@ -1066,7 +1066,7 @@
return clip->InsertSilence(0, len);
}
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip *clip = it->GetData();
if (clip->GetStartTime() > t)
@@ -1091,7 +1091,7 @@
wxBusyCursor busy;
- for( WaveClipList::Node *it = GetClipIterator(); it; it = it->GetNext() )
+ for( WaveClipList::compatibility_iterator it = GetClipIterator(); it; it =
it->GetNext() )
{
WaveClip *clip = it->GetData();
@@ -1169,7 +1169,7 @@
{
// Merge all WaveClips overlapping selection into one
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
WaveClipList clipsToDelete;
WaveClip *newClip;
@@ -1240,7 +1240,7 @@
{
sampleCount bestBlockSize = GetMaxBlockSize();
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* clip = it->GetData();
sampleCount startSample = (sampleCount)floor(clip->GetStartTime()*mRate
+ 0.5);
@@ -1258,7 +1258,7 @@
sampleCount WaveTrack::GetMaxBlockSize()
{
int maxblocksize = 0;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* clip = it->GetData();
if (clip->GetSequence()->GetMaxBlockSize() > maxblocksize)
@@ -1419,7 +1419,7 @@
xmlFile.WriteAttr(wxT("gain"), (double)mGain);
xmlFile.WriteAttr(wxT("pan"), (double)mPan);
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
it->GetData()->WriteXML(xmlFile);
}
@@ -1429,7 +1429,7 @@
bool WaveTrack::GetErrorOpening()
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
if (it->GetData()->GetSequence()->GetErrorOpening())
return true;
@@ -1438,7 +1438,7 @@
bool WaveTrack::Lock()
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
it->GetData()->Lock();
return true;
@@ -1446,7 +1446,7 @@
bool WaveTrack::CloseLock()
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
it->GetData()->CloseLock();
return true;
@@ -1455,7 +1455,7 @@
bool WaveTrack::Unlock()
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
it->GetData()->Unlock();
return true;
@@ -1479,7 +1479,7 @@
if (mClips.IsEmpty())
return 0;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
if (!found)
{
found = true;
@@ -1498,7 +1498,7 @@
if (mClips.IsEmpty())
return 0;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
if (!found)
{
found = true;
@@ -1528,7 +1528,7 @@
bool result = true;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* clip = it->GetData();
@@ -1563,7 +1563,7 @@
double sumsq = 0.0;
sampleCount length = 0;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* clip = it->GetData();
@@ -1591,7 +1591,7 @@
// Simple optimization: When this buffer is completely contained within one
clip,
// don't clear anything (because we never won't have to). Otherwise, just
clear
// everything to be on the safe side.
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
bool doClear = true;
for (it=GetClipIterator(); it; it=it->GetNext())
@@ -1645,7 +1645,7 @@
{
bool result = true;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip *clip = it->GetData();
@@ -1688,7 +1688,7 @@
double startTime = t0;
double endTime = t0+tstep*bufferLen;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip *clip = it->GetData();
@@ -1718,7 +1718,7 @@
WaveClip* WaveTrack::GetClipAtX(int xcoord)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
wxRect r;
it->GetData()->GetDisplayRect(&r);
@@ -1741,7 +1741,7 @@
// Search for any active DragPoint on the current track
Envelope* WaveTrack::GetActiveEnvelope(void)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* clip = it->GetData();
Envelope* env = clip->GetEnvelope() ;
@@ -1798,7 +1798,7 @@
void WaveTrack::MoveClipToTrack(int clipIndex, WaveTrack* dest)
{
- WaveClipList::Node* node = mClips.Item(clipIndex);
+ WaveClipList::compatibility_iterator node = mClips.Item(clipIndex);
WaveClip* clip = node->GetData();
mClips.DeleteNode(node);
dest->mClips.Append(clip);
@@ -1806,7 +1806,7 @@
void WaveTrack::MoveClipToTrack(WaveClip *clip, WaveTrack* dest)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext()) {
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext()) {
if (it->GetData() == clip) {
WaveClip* clip = it->GetData();
mClips.DeleteNode(it);
@@ -1822,7 +1822,7 @@
if (allowedAmount)
*allowedAmount = amount;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* c = it->GetData();
if (c != clip && c->GetStartTime() < clip->GetEndTime()+amount &&
@@ -1866,7 +1866,7 @@
bool WaveTrack::CanInsertClip(WaveClip* clip)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* c = it->GetData();
if (c->GetStartTime() < clip->GetEndTime() && c->GetEndTime() >
clip->GetStartTime())
@@ -1886,7 +1886,7 @@
bool WaveTrack::SplitAt(double t)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* c = it->GetData();
if (t > c->GetStartTime() && t < c->GetEndTime())
@@ -1960,7 +1960,7 @@
WaveClip* clip = clips.Item(i);
WaveClipList* cutlines = clip->GetCutLines();
- for (WaveClipList::Node* it = cutlines->GetFirst(); it;
+ for (WaveClipList::compatibility_iterator it = cutlines->GetFirst(); it;
it = it->GetNext())
{
// Add cut line expander point
@@ -1998,14 +1998,14 @@
gPrefs->Read(wxT("/GUI/EditClipCanMove"), &editClipCanMove);
// Find clip which contains this cut line
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
{
WaveClip* clip = it->GetData();
double start = 0, end = 0;
if (clip->FindCutLine(cutLinePosition, &start, &end))
{
- WaveClipList::Node* it2;
+ WaveClipList::compatibility_iterator it2;
if (!editClipCanMove)
{
@@ -2056,7 +2056,7 @@
bool WaveTrack::RemoveCutLine(double cutLinePosition)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
if (it->GetData()->RemoveCutLine(cutLinePosition))
return true;
@@ -2084,7 +2084,7 @@
bool WaveTrack::Resample(int rate, ProgressDialog *progress)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
if (!it->GetData()->Resample(rate, progress))
{
// FIXME: The track is now in an inconsistent state since some
@@ -2109,7 +2109,7 @@
{
clips.Empty();
- for (WaveClipList::Node *it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
clips.Add(it->GetData());
clips.Sort(SortClipArrayCmpFunc);
@@ -2118,14 +2118,14 @@
///Deletes all clips' wavecaches. Careful, This may not be threadsafe.
void WaveTrack::DeleteWaveCaches()
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
it->GetData()->DeleteWaveCache();
}
///Adds an invalid region to the wavecache so it redraws that portion only.
void WaveTrack::AddInvalidRegion(sampleCount startSample, sampleCount
endSample)
{
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it;
it=it->GetNext())
it->GetData()->AddInvalidRegion(startSample,endSample);
}
Index: TrackArtist.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- TrackArtist.cpp 20 Apr 2009 02:42:28 -0000 1.145
+++ TrackArtist.cpp 20 Apr 2009 17:27:22 -0000 1.146
@@ -232,7 +232,7 @@
case Track::Wave:
{
WaveTrack* wt = (WaveTrack*)t;
- for (WaveClipList::Node* it=wt->GetClipIterator(); it;
it=it->GetNext()) {
+ for (WaveClipList::compatibility_iterator
it=wt->GetClipIterator(); it; it=it->GetNext()) {
it->GetData()->ClearDisplayRect();
}
@@ -778,7 +778,7 @@
bool drawSamples,
bool showPoints, bool muted)
{
- for (WaveClipList::Node* it = track->GetClipIterator(); it; it =
it->GetNext())
+ for (WaveClipList::compatibility_iterator it = track->GetClipIterator();
it; it = it->GetNext())
DrawIndividualClipSamples(dc, r, it->GetData(), t0, pps, h,
zoomMin, zoomMax, dB, drawSamples, showPoints, muted);
}
@@ -1220,7 +1220,7 @@
dc.SetBrush(blankBrush);
dc.DrawRectangle(r);
- for (WaveClipList::Node* it=track->GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=track->GetClipIterator(); it;
it=it->GetNext())
DrawClipWaveform(track, it->GetData(), dc, r, viewInfo, drawEnvelope,
drawSamples,
drawSliders, dB, muted);
@@ -1613,7 +1613,7 @@
return;
}
- for (WaveClipList::Node* it=track->GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=track->GetClipIterator(); it;
it=it->GetNext())
DrawClipSpectrum(track, it->GetData(), dc, r, viewInfo, autocorrelation,
logF);
}
@@ -2113,7 +2113,7 @@
void TrackArtist::InvalidateSpectrumCache(WaveTrack *track)
{
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
for (it = track->GetClipIterator(); it; it = it->GetNext()) {
it->GetData()->mSpecPxCache->valid = false;
}
Index: CrossFade.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/CrossFade.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CrossFade.cpp 12 Jul 2008 15:25:33 -0000 1.3
+++ CrossFade.cpp 20 Apr 2009 17:27:22 -0000 1.4
@@ -77,7 +77,7 @@
WaveClip * tmpclip = NULL;
Sequence * tmp = NULL;
- WaveClipList::Node * it;
+ WaveClipList::compatibility_iterator it;
//Go through each clip, adding it to the total in the appropriate way.
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -d -r1.418 -r1.419
--- Project.cpp 17 Apr 2009 00:35:40 -0000 1.418
+++ Project.cpp 20 Apr 2009 17:27:22 -0000 1.419
@@ -980,7 +980,7 @@
if (pTrack->GetKind() == Track::Wave)
{
WaveTrack* pWaveTrack = (WaveTrack*)pTrack;
- WaveClipList::Node* node = pWaveTrack->GetClipIterator();
+ WaveClipList::compatibility_iterator node =
pWaveTrack->GetClipIterator();
while (node)
{
WaveClip *clip = node->GetData();
@@ -1920,7 +1920,7 @@
l.DeleteContents(true);
wxGetApp().mImporter->GetSupportedImportFormats(&l);
- for (FormatList::Node *n = l.GetFirst(); n; n = n->GetNext()) {
+ for (FormatList::compatibility_iterator n = l.GetFirst(); n; n =
n->GetNext()) {
Format *f = n->GetData();
wxString newfilter = f->formatName + wxT("|");
@@ -2263,7 +2263,7 @@
if (t->GetKind() == Track::Wave)
{
// Only wave tracks have a notion of "changed"
- for (WaveClipList::Node*
it=((WaveTrack*)t)->GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator
it=((WaveTrack*)t)->GetClipIterator(); it; it=it->GetNext())
it->GetData()->MarkChanged();
}
t = iter.Next();
Index: Dependencies.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Dependencies.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Dependencies.cpp 2 Feb 2009 17:11:04 -0000 1.14
+++ Dependencies.cpp 20 Apr 2009 17:27:22 -0000 1.15
@@ -52,7 +52,7 @@
while (t) {
if (t->GetKind() == Track::Wave) {
WaveTrack *waveTrack = (WaveTrack *)t;
- WaveClipList::Node* node = waveTrack->GetClipIterator();
+ WaveClipList::compatibility_iterator node =
waveTrack->GetClipIterator();
while(node) {
WaveClip *clip = node->GetData();
Sequence *sequence = clip->GetSequence();
Index: WaveClip.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveClip.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- WaveClip.cpp 5 Feb 2009 22:15:37 -0000 1.48
+++ WaveClip.cpp 20 Apr 2009 17:27:22 -0000 1.49
@@ -286,7 +286,7 @@
mSpecCache = new SpecCache(1, 1, false);
mSpecPxCache = new SpecPxCache(1);
- for (WaveClipList::Node* it=orig.mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=orig.mCutLines.GetFirst(); it;
it=it->GetNext())
mCutLines.Append(new WaveClip(*it->GetData(), projDirManager));
mAppendBuffer = NULL;
@@ -1035,7 +1035,7 @@
mSequence->WriteXML(xmlFile);
mEnvelope->WriteXML(xmlFile);
- for (WaveClipList::Node* it=mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=mCutLines.GetFirst(); it;
it=it->GetNext())
it->GetData()->WriteXML(xmlFile);
xmlFile.EndTag(wxT("waveclip"));
@@ -1100,7 +1100,7 @@
OffsetCutLines(t0, other->GetEndTime()-other->GetStartTime());
// Paste cut lines contained in pasted clip
- for (WaveClipList::Node* it=other->mCutLines.GetFirst(); it;
it=it->GetNext())
+ for (WaveClipList::compatibility_iterator
it=other->mCutLines.GetFirst(); it; it=it->GetNext())
{
WaveClip* cutline = it->GetData();
WaveClip* newCutLine = new WaveClip(*cutline,
@@ -1167,9 +1167,9 @@
if (clip_t1 > GetEndTime())
clip_t1 = GetEndTime();
- WaveClipList::Node* nextIt = (WaveClipList::Node*)-1;
+ WaveClipList::compatibility_iterator nextIt;
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=nextIt)
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=nextIt)
{
nextIt = it->GetNext();
WaveClip* clip = it->GetData();
@@ -1218,9 +1218,9 @@
newClip->SetOffset(clip_t0-mOffset);
// Sort out cutlines that belong to the new cutline
- WaveClipList::Node* nextIt = (WaveClipList::Node*)-1;
+ WaveClipList::compatibility_iterator nextIt;
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=nextIt)
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=nextIt)
{
nextIt = it->GetNext();
WaveClip* clip = it->GetData();
@@ -1265,7 +1265,7 @@
double* cutlineStart /* = NULL */,
double* cutlineEnd /* = NULL */)
{
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=it->GetNext())
{
WaveClip* cutline = it->GetData();
if (fabs(mOffset + cutline->GetOffset() - cutLinePosition) < 0.0001)
@@ -1283,7 +1283,7 @@
bool WaveClip::ExpandCutLine(double cutLinePosition)
{
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=it->GetNext())
{
WaveClip* cutline = it->GetData();
if (fabs(mOffset + cutline->GetOffset() - cutLinePosition) < 0.0001)
@@ -1301,7 +1301,7 @@
bool WaveClip::RemoveCutLine(double cutLinePosition)
{
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=it->GetNext())
{
if (fabs(mOffset + it->GetData()->GetOffset() - cutLinePosition) <
0.0001)
{
@@ -1318,7 +1318,7 @@
{
while (!mCutLines.IsEmpty())
{
- WaveClipList::Node* head = mCutLines.GetFirst();
+ WaveClipList::compatibility_iterator head = mCutLines.GetFirst();
delete head->GetData();
mCutLines.DeleteNode(head);
}
@@ -1326,7 +1326,7 @@
void WaveClip::OffsetCutLines(double t0, double len)
{
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=it->GetNext())
{
WaveClip* cutLine = it->GetData();
if (mOffset + cutLine->GetOffset() >= t0)
@@ -1337,21 +1337,21 @@
void WaveClip::Lock()
{
GetSequence()->Lock();
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=it->GetNext())
it->GetData()->Lock();
}
void WaveClip::CloseLock()
{
GetSequence()->CloseLock();
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=it->GetNext())
it->GetData()->Lock();
}
void WaveClip::Unlock()
{
GetSequence()->Unlock();
- for (WaveClipList::Node* it = mCutLines.GetFirst(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it = mCutLines.GetFirst(); it;
it=it->GetNext())
it->GetData()->Unlock();
}
Index: Snap.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Snap.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Snap.cpp 5 Mar 2007 05:08:09 -0000 1.1
+++ Snap.cpp 20 Apr 2009 17:27:22 -0000 1.2
@@ -53,7 +53,7 @@
}
if (track->GetKind() == Track::Wave) {
WaveTrack *waveTrack = (WaveTrack *)track;
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
for (it=waveTrack->GetClipIterator(); it; it=it->GetNext()) {
WaveClip *clip = it->GetData();
if (exclusions) {
Index: UndoManager.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/UndoManager.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- UndoManager.cpp 9 Apr 2009 06:14:03 -0000 1.26
+++ UndoManager.cpp 20 Apr 2009 17:27:22 -0000 1.27
@@ -53,7 +53,7 @@
{
TrackListOfKindIterator iter(Track::Wave);
WaveTrack *wt;
- WaveClipList::Node *it;
+ WaveClipList::compatibility_iterator it;
BlockArray *blocks;
unsigned int i;
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
