Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-13 14:13:32 +02:00
Code Issues Releases Wiki Activity

Rewrite many iterations over tracks and channels in src/import, src/export

Browse Source
This commit is contained in:
Paul Licameli
2018-09-18 12:00:42 -04:00
parent c7ab9f2338
commit 3eee8b8cf0
4 changed files with 74 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/import/ImportLOF.cpp
View File

@@ -268,22 +268,6 @@ ProgressResult LOFImportFileHandle::Import(TrackFactory * WXUNUSED(trackFactory)
return ProgressResult::Success;
}
static int CountNumTracks(AudacityProject *proj)
{
int count = 0;
Track *t;
TrackListIterator iter(proj->GetTracks());
t = iter.First();
while(t) {
count++;
t = iter.Next();
}
return count;
}
/** @brief Processes a single line from a LOF text file, doing whatever is
* indicated on the line.
*
@@ -432,18 +416,14 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
;
else if (Internat::CompatibleToDouble(tokenholder, &offset))
{
Track *t;
TrackListIterator iter(mProject->GetTracks());
t = iter.First();
for (int i = 1; i < CountNumTracks(mProject) - 1; i++)
t = iter.Next();
auto tracks = mProject->GetTracks();
auto t = *tracks->Leaders().rbegin();
// t is now the last track in the project, unless the import of
// all tracks failed, in which case it will be null. In that
// case we return because we cannot offset a non-existent track.
if (t == NULL) return;
if (t == NULL)
return;
#ifdef USE_MIDI
if (targetfile.AfterLast(wxT('.')).IsSameAs(wxT("mid"), false) ||
targetfile.AfterLast(wxT('.')).IsSameAs(wxT("midi"), false))
@@ -454,16 +434,8 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
else
#endif
{
if (CountNumTracks(mProject) == 1)
t->SetOffset(offset);
else
{
if (t->GetLinked())
t->SetOffset(offset);
t = iter.Next();
t->SetOffset(offset);
}
for (auto channel : TrackList::Channels(t))
channel->SetOffset(offset);
}
// Amend the undo transaction made by import