Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-24 16:01:16 +02:00
Code Issues Releases Wiki Activity

Revert "Bug 2508 - Macros: Export2 handles channels > 2 incorrectly"

Browse Source 
This reverts commit 2ecc98225f93e8c3fc85ce61991d0f33364e8b8e.

This is the one I was supposed to revert.
This commit is contained in:
Leland Lucius 2021-01-29 06:38:12 -06:00
parent 76460c73da
commit 52bde299aa
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/export/Export.cpp
View File

@ -487,8 +487,7 @@ bool Exporter::Process(unsigned numChannels,
mActualName = mFilename; mActualName = mFilename;
int i = -1; int i = -1;
for (const auto &pPlugin : mPlugins) for (const auto &pPlugin : mPlugins) {
{
++i; ++i;
for (int j = 0; j < pPlugin->GetFormatCount(); j++) for (int j = 0; j < pPlugin->GetFormatCount(); j++)
{ {
@ -496,26 +495,7 @@ bool Exporter::Process(unsigned numChannels,
{ {
mFormat = i; mFormat = i;
mSubFormat = j; mSubFormat = j;
return CheckFilename() && ExportTracks();
// Gather track information
if (!ExamineTracks())
{
return false;
}
// Check for down mixing
if (!CheckMix(false))
{
return false;
}
// Ensure filename doesn't interfere with project files.
if (!CheckFilename())
{
return false;
}
return ExportTracks();
} }
} }
} }