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

Bug 2743 - The first use of the "window" command in LOF files is ignored by Audacity

Browse Source
This commit is contained in:
James Crook 2021-04-20 11:51:15 +01:00
parent b10a9897c4
commit 678dffa012
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/import/ImportLOF.cpp
View File

@ -151,7 +151,7 @@ private:
AudacityProject *mProject{}; AudacityProject *mProject{};
// In order to know whether or not to create a NEW window // In order to know whether or not to create a NEW window
bool windowCalledOnce{ false }; int nFilesInGroup{ 0 };
// In order to zoom in, it must be done after files are opened // In order to zoom in, it must be done after files are opened
bool callDurationFactor{ false }; bool callDurationFactor{ false };
@ -315,15 +315,11 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
// set any duration/offset factors for last window, as all files were called // set any duration/offset factors for last window, as all files were called
doDurationAndScrollOffset(); doDurationAndScrollOffset();
if (windowCalledOnce) if (nFilesInGroup > 0 )
// Cause a project to be created with the next import // Cause a project to be created with the next import
mProject = nullptr; mProject = nullptr;
else
// Apply any offset and duration directives of the first "window" line
// to the previously open project, not a NEW one.
;
windowCalledOnce = true; nFilesInGroup = 0;
while (tok.HasMoreTokens()) while (tok.HasMoreTokens())
{ {
@ -382,7 +378,7 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
else if (tokenholder.IsSameAs(wxT("file"), false)) else if (tokenholder.IsSameAs(wxT("file"), false))
{ {
nFilesInGroup++;
// To identify filename and open it // To identify filename and open it
tokenholder = temptok1.GetNextToken(); tokenholder = temptok1.GetNextToken();
wxString targettoken = temptok1.GetNextToken(); wxString targettoken = temptok1.GetNextToken();