Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-14 15:29:53 +02:00
Code Issues Releases Wiki Activity

Fix Show/Hide Tags Dialog, for export multiple by Labels.

Browse Source 
Previously I only fixed the export by tracks case.
Oh beware, duplicated code.
This commit is contained in:
James Crook 2019-04-13 14:27:25 +01:00
parent 78cb554883
commit 5c361631c6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/export/ExportMultiple.cpp
View File

@ -645,11 +645,11 @@ bool ExportMultiple::DirOk()
} }
// TODO: JKC July2016: Merge labels/tracks duplicated export code. // TODO: JKC July2016: Merge labels/tracks duplicated export code.
// TODO: JKC Apr2019: Doubly so merge these! Too much duplication.
ProgressResult ExportMultiple::ExportMultipleByLabel(bool byName, ProgressResult ExportMultiple::ExportMultipleByLabel(bool byName,
const wxString &prefix, bool addNumber) const wxString &prefix, bool addNumber)
{ {
wxASSERT(mProject); wxASSERT(mProject);
bool tagsPrompt = mProject->GetShowId3Dialog();
int numFiles = mNumLabels; int numFiles = mNumLabels;
int l = 0; // counter for files done int l = 0; // counter for files done
std::vector<ExportKit> exportSettings; // dynamic array for settings. std::vector<ExportKit> exportSettings; // dynamic array for settings.
@ -739,8 +739,14 @@ ProgressResult ExportMultiple::ExportMultipleByLabel(bool byName,
setting.filetags.SetTag(TAG_TITLE, title); setting.filetags.SetTag(TAG_TITLE, title);
setting.filetags.SetTag(TAG_TRACK, l+1); setting.filetags.SetTag(TAG_TRACK, l+1);
// let the user have a crack at editing it, exit if cancelled // let the user have a crack at editing it, exit if cancelled
if( !setting.filetags.ShowEditDialog(mProject, _("Edit Metadata Tags"), tagsPrompt) ) bool bShowTagsDialog = mProject->GetShowId3Dialog();
return ProgressResult::Cancelled; if( bShowTagsDialog ){
bool bCancelled = !setting.filetags.ShowEditDialog(mProject,_("Edit Metadata Tags"), bShowTagsDialog);
gPrefs->Read(wxT("/AudioFiles/ShowId3Dialog"), &bShowTagsDialog, true);
mProject->SetShowId3Dialog( bShowTagsDialog );
if( bCancelled )
return ProgressResult::Cancelled;
}
} }
/* add the settings to the array of settings to be used for export */ /* add the settings to the array of settings to be used for export */