Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-19 17:40:51 +02:00
Code Issues Releases Wiki Activity

Fix build when wxWidgets is built to use STL as it is on openSUSE.

Browse Source
This commit is contained in:
lllucius 2011-04-17 03:42:35 +00:00
parent 89d88cc7ba
commit 4ef4adb6eb
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Menus.cpp
View File

@ -1517,7 +1517,7 @@ void AudacityProject::ModifyAllProjectToolbarMenus()
{ {
AProjectArray::iterator i; AProjectArray::iterator i;
for (i = gAudacityProjects.begin(); i != gAudacityProjects.end(); ++i) { for (i = gAudacityProjects.begin(); i != gAudacityProjects.end(); ++i) {
(*i)->ModifyToolbarMenus(); ((AudacityProject *)*i)->ModifyToolbarMenus();
} }
} }

2
src/WaveTrack.cpp
View File

@ -653,7 +653,7 @@ bool WaveTrack::SplitDelete(double t0, double t1)
WaveClip* WaveTrack::RemoveAndReturnClip(WaveClip* clip) WaveClip* WaveTrack::RemoveAndReturnClip(WaveClip* clip)
{ {
wxWaveClipListNode* node = mClips.Find(clip); WaveClipList::compatibility_iterator node = mClips.Find(clip);
WaveClip* clipReturn = node->GetData(); WaveClip* clipReturn = node->GetData();
mClips.DeleteNode(node); mClips.DeleteNode(node);
return clipReturn; return clipReturn;

2
src/commands/CommandManager.cpp
View File

@ -480,7 +480,7 @@ void CommandManager::AddItem(const wxChar *name,
{ {
wxString label(label_in); wxString label(label_in);
label += wxT("\t"); label += wxT("\t");
label += accel; label += accel ? accel : wxEmptyString;
if (ItemShouldBeHidden(label)) { if (ItemShouldBeHidden(label)) {
delete callback; delete callback;

7
src/effects/Reverse.cpp
View File

@ -81,8 +81,7 @@ bool EffectReverse::ProcessOneWave(int count, WaveTrack * track, sampleCount sta
// STEP 1: // STEP 1:
// If a reverse selection begins and/or ends at the inside of a clip // If a reverse selection begins and/or ends at the inside of a clip
// perform a split at the start and/or end of the reverse selection // perform a split at the start and/or end of the reverse selection
WaveClipList::compatibility_iterator clipIterator = track->GetClipIterator(); WaveClipList::compatibility_iterator node = track->GetClipIterator();
wxWaveClipListNode *node = (wxWaveClipListNode*)clipIterator;
while (node) { while (node) {
WaveClip *clip = node->GetData(); WaveClip *clip = node->GetData();
sampleCount clipStart = clip->GetStartSample(); sampleCount clipStart = clip->GetStartSample();
@ -176,13 +175,13 @@ bool EffectReverse::ProcessOneWave(int count, WaveTrack * track, sampleCount sta
// revClips and otherClips back to the track // revClips and otherClips back to the track
size_t revClipsCount = revClips.GetCount(); size_t revClipsCount = revClips.GetCount();
for (i = 0; i < revClipsCount; i++) { for (i = 0; i < revClipsCount; i++) {
wxWaveClipListNode *node = revClips.Item(revClipsCount - 1 - i); // the last clip of revClips is appended to the track first WaveClipList::compatibility_iterator node = revClips.Item(revClipsCount - 1 - i); // the last clip of revClips is appended to the track first
WaveClip *clip = node->GetData(); WaveClip *clip = node->GetData();
track->AddClip(clip); track->AddClip(clip);
} }
for (i = 0; i < otherClips.GetCount(); i++) { for (i = 0; i < otherClips.GetCount(); i++) {
wxWaveClipListNode *node = otherClips.Item(i); WaveClipList::compatibility_iterator node = otherClips.Item(i);
track->AddClip(node->GetData()); track->AddClip(node->GetData());
} }