File audacity-1.3.7-wxGTK_with_stl.patch of Package audacity
--- src/CrossFade.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/CrossFade.cpp 2009-04-08 14:52:30.000000000 +0200
@@ -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.
--- src/Dependencies.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/Dependencies.cpp 2009-04-08 14:50:20.00000000 +0200
@@ -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();
--- src/import/Import.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/import/Import.cpp 2009-04-08 14:53:21.000000000 +0200
@@ -94,7 +94,7 @@
void Importer::GetSupportedImportFormats(FormatList *formatList)
{
- ImportPluginList::Node *importPluginNode = mImportPluginList->GetFirst();
+ ImportPluginList::compatibility_iterator importPluginNode = mImportPluginList->GetFirst();
while(importPluginNode)
{
ImportPlugin *importPlugin = importPluginNode->GetData();
@@ -121,7 +121,7 @@
bool haveCompatiblePlugin = false;
- ImportPluginList::Node *importPluginNode;
+ ImportPluginList::compatibility_iterator importPluginNode;
// If user explicitly selected a filter,
// then we should try importing via corresponding plugin first
@@ -219,7 +219,7 @@
// None of our plugins can handle this file. It might be that
// Audacity supports this format, but support was not compiled in.
// If so, notify the user of this fact
- UnusableImportPluginList::Node *unusableImporterNode
+ UnusableImportPluginList::compatibility_iterator unusableImporterNode
= mUnusableImportPluginList->GetFirst();
while(unusableImporterNode)
{
--- src/Mix.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/Mix.cpp 2009-04-08 14:48:22.000000000 +0200
@@ -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) {
--- src/ondemand/ODComputeSummaryTask.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/ondemand/ODComputeSummaryTask.cpp 2009-04-08 14:50:55.000000000 +0200
@@ -186,7 +186,7 @@
Sequence *seq;
//gather all the blockfiles that we should process in the wavetrack.
- WaveClipList::Node* node = mWaveTracks[j]->GetClipIterator();
+ WaveClipList::compatibility_iterator node = mWaveTracks[j]->GetClipIterator();
int numBlocksDone;
while(node) {
--- src/ondemand/ODDecodeTask.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/ondemand/ODDecodeTask.cpp 2009-04-08 14:51:12.000000000 +0200
@@ -113,7 +113,7 @@
Sequence *seq;
//gather all the blockfiles that we should process in the wavetrack.
- WaveClipList::Node* node = mWaveTracks[j]->GetClipIterator();
+ WaveClipList::compatibility_iterator node = mWaveTracks[j]->GetClipIterator();
int numBlocksDone;
while(node) {
--- src/Project.cpp 2009-01-27 21:50:59.000000000 +0100
+++ src/Project.cpp 2009-04-08 14:53:03.000000000 +0200
@@ -923,7 +923,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();
@@ -1803,7 +1803,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("|");
@@ -2141,7 +2141,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();
--- src/Snap.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/Snap.cpp 2009-04-08 14:49:15.000000000 +0200
@@ -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) {
--- src/TrackArtist.cpp 2009-04-07 17:18:14.000000000 +0200
+++ src/TrackArtist.cpp 2009-04-08 14:47:50.000000000 +0200
@@ -187,7 +187,7 @@
if (t->GetKind() == 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();
}
@@ -780,7 +780,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);
}
@@ -1222,7 +1222,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);
@@ -1600,7 +1600,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);
}
--- src/Track.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/Track.cpp 2009-04-08 14:49:36.000000000 +0200
@@ -745,7 +745,7 @@
for (TrackListNode *p = head; p; p = p->next) {
if (p->t->GetKind() == Track::Wave) {
WaveTrack* track = ((WaveTrack*)p->t);
- for (WaveClipList::Node* it=track->GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=track->GetClipIterator(); it; it=it->GetNext())
{
WaveClip* clip = it->GetData();
BlockArray *blocks = clip->GetSequenceBlockArray();
@@ -779,7 +779,7 @@
for (p = head; p; p = p->next) {
if (p->t->GetKind() == Track::Wave) {
WaveTrack* track = ((WaveTrack*)p->t);
- for (WaveClipList::Node* it=track->GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=track->GetClipIterator(); it; it=it->GetNext())
{
WaveClip* clip = it->GetData();
BlockArray *blocks = clip->GetSequenceBlockArray();
@@ -799,7 +799,7 @@
for (p = stackElem->tracks->head; p; p = p->next) {
if (p->t->GetKind() == Track::Wave) {
WaveTrack* track = ((WaveTrack*)p->t);
- for (WaveClipList::Node* it=track->GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=track->GetClipIterator(); it; it=it->GetNext())
{
WaveClip* clip = it->GetData();
BlockArray *blocks = clip->GetSequenceBlockArray();
--- src/TrackPanel.cpp 2009-04-07 17:18:14.000000000 +0200
+++ src/TrackPanel.cpp 2009-04-08 14:48:06.000000000 +0200
@@ -2862,7 +2862,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();
clip->mSpecPxCache->valid = false;
@@ -2880,7 +2880,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();
clip->mSpecPxCache->valid = false;
@@ -6228,7 +6228,7 @@
WaveTrack *wt = (WaveTrack *) mPopupMenuTarget;
if (wt->GetDisplay()!= id - OnWaveformID) {
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
for(it=wt->GetClipIterator(); it; it=it->GetNext()) {
WaveClip *clip = it->GetData();
clip->mSpecPxCache->valid = false;
--- src/WaveClip.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/WaveClip.cpp 2009-04-08 14:46:59.000000000 +0200
@@ -282,7 +282,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;
@@ -1023,7 +1023,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"));
@@ -1088,7 +1088,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,
@@ -1155,9 +1155,9 @@
if (clip_t1 > GetEndTime())
clip_t1 = GetEndTime();
- WaveClipList::Node* nextIt = (WaveClipList::Node*)-1;
+ WaveClipList::compatibility_iterator nextIt;// = (WaveClipList::compatibility_iterator)-1;
- 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();
@@ -1206,9 +1206,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;// = (WaveClipList::compatibility_iterator)-1;
- 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();
@@ -1253,7 +1253,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)
@@ -1271,7 +1271,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)
@@ -1289,7 +1289,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)
{
@@ -1306,7 +1306,7 @@
{
while (!mCutLines.IsEmpty())
{
- WaveClipList::Node* head = mCutLines.GetFirst();
+ WaveClipList::compatibility_iterator head = mCutLines.GetFirst();
delete head->GetData();
mCutLines.DeleteNode(head);
}
@@ -1314,7 +1314,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)
@@ -1325,21 +1325,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();
}
--- src/WaveTrack.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/WaveTrack.cpp 2009-04-08 14:52:03.000000000 +0200
@@ -108,7 +108,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));
}
@@ -147,7 +147,7 @@
ODManager::Instance()->RemoveWaveTrack(this);
#endif
- 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)
@@ -164,7 +164,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);
@@ -198,7 +198,7 @@
void WaveTrack::SetRate(double newRate)
{
mRate = (int) newRate;
- for (WaveClipList::Node* it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList it=GetClipIterator(); it; it=it->GetNext())
it->GetData()->SetRate((int) newRate);
}
@@ -245,7 +245,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;
@@ -254,7 +254,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())
@@ -321,7 +321,7 @@
// the left selection t0.
double firstGreaterOffset = -1;
- WaveClipList::Node * it;
+ WaveClipList::compatibility_iterator it;
for(it = GetClipIterator(); it; it = it->GetNext())
{
@@ -382,7 +382,7 @@
newTrack->Init(*this);
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
for (it=GetClipIterator(); it; it=it->GetNext())
{
@@ -496,7 +496,7 @@
//printf("paste: we have at least one clip\n");
double insertDuration = other->GetEndTime();
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
#ifdef EXPERIMENTAL_STICKY_TRACKS
if (mStickyLabelTrack) mStickyLabelTrack->ShiftLabelsOnInsert(insertDuration, t0);
@@ -741,7 +741,7 @@
bool editClipCanMove = true;
gPrefs->Read(wxT("/GUI/EditClipCanMove"), &editClipCanMove);
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
WaveClipList clipsToDelete;
WaveClipList clipsToAdd;
@@ -956,7 +956,7 @@
//printf("paste: we have at least one clip\n");
double insertDuration = other->GetEndTime();
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
#ifdef EXPERIMENTAL_STICKY_TRACKS
if (mStickyLabelTrack) mStickyLabelTrack->ShiftLabelsOnInsert(insertDuration, t0);
@@ -1100,7 +1100,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();
@@ -1146,7 +1146,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)
@@ -1171,7 +1171,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();
@@ -1249,7 +1249,7 @@
{
// Merge all WaveClips overlapping selection into one
- WaveClipList::Node* it;
+ WaveClipList::compatibility_iterator it;
WaveClipList clipsToDelete;
WaveClip *newClip;
@@ -1320,7 +1320,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);
@@ -1338,7 +1338,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)
@@ -1483,7 +1483,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);
}
@@ -1493,7 +1493,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;
@@ -1502,7 +1502,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;
@@ -1510,7 +1510,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;
@@ -1519,7 +1519,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;
@@ -1543,7 +1543,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;
@@ -1562,7 +1562,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;
@@ -1592,7 +1592,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();
@@ -1627,7 +1627,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();
@@ -1655,7 +1655,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())
@@ -1709,7 +1709,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();
@@ -1752,7 +1752,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();
@@ -1782,7 +1782,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);
@@ -1805,7 +1805,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() ;
@@ -1862,7 +1862,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);
@@ -1870,7 +1870,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);
@@ -1886,7 +1886,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 &&
@@ -1930,7 +1930,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())
@@ -1950,7 +1950,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())
@@ -2024,7 +2024,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
@@ -2062,14 +2062,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)
{
@@ -2120,7 +2120,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;
@@ -2148,7 +2148,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
@@ -2173,7 +2173,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);
@@ -2182,14 +2182,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);
}
--- src/WaveTrack.h 2009-04-08 14:41:18.000000000 +0200
+++ src/WaveTrack.h 2009-04-08 14:45:16.000000000 +0200
@@ -242,7 +242,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.
--- src/AboutDialog.cpp 2009-01-27 21:50:58.000000000 +0100
+++ src/AboutDialog.cpp 2009-04-08 15:15:38.000000000 +0200
@@ -820,7 +820,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)
--- src/BatchCommands.cpp 2009-04-08 15:27:24.000000000 +0200
+++ src/BatchCommands.cpp 2009-04-08 15:27:34.000000000 +0200
@@ -251,7 +251,7 @@
// Gets all commands that are valid for this mode.
wxArrayString BatchCommands::GetAllCommands()
{
- wxArrayString commands(true);
+ wxArrayString commands;//(true);
wxString command;
commands.Clear();
--- src/TrackPanel.cpp 2009-04-08 15:39:17.000000000 +0200
+++ src/TrackPanel.cpp 2009-04-08 15:41:09.000000000 +0200
@@ -2187,7 +2187,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();
@@ -6324,7 +6324,7 @@
wxMenuItem * item;
int id;
- for ( wxwxMenuItemListNode * node = list.GetFirst(); node; node = node->GetNext() )
+ for ( wxMenuItemList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
{
item = node->GetData();
id = item->GetId();
--- src/WaveTrack.cpp
+++ src/WaveTrack.cpp
@@ -198,7 +198,7 @@
void WaveTrack::SetRate(double newRate)
{
mRate = (int) newRate;
- for (WaveClipList it=GetClipIterator(); it; it=it->GetNext())
+ for (WaveClipList::compatibility_iterator it=GetClipIterator(); it; it=it->GetNext())
it->GetData()->SetRate((int) newRate);
}
