1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-25 08:38:39 +02:00
This commit is contained in:
Leland Lucius 2015-08-26 12:40:55 -05:00
parent 5c3ff022e6
commit e5ce636234

View File

@ -217,19 +217,17 @@ int ExportMultiple::ShowModal()
void ExportMultiple::PopulateOrExchange(ShuttleGui& S) void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
{ {
wxString name = mProject->GetName(); wxString name = mProject->GetName();
wxString defaultFormat = gPrefs->Read(wxT("/Export/Format"), wxT("WAV"));
wxArrayString formats;
mPluginIndex = -1; mPluginIndex = -1;
wxString defaultFormat = gPrefs->Read(wxT("/Export/Format"),
wxT("WAV"));
mFilterIndex = 0; mFilterIndex = 0;
for (size_t i = 0; i < mPlugins.GetCount(); i++) { for (size_t i = 0; i < mPlugins.GetCount(); i++) {
for (int j = 0; j < mPlugins[i]->GetFormatCount(); j++) for (int j = 0; j < mPlugins[i]->GetFormatCount(); j++)
{ {
formats.Add(mPlugins[i]->GetDescription(j));
if (mPlugins[i]->GetFormat(j) == defaultFormat) { if (mPlugins[i]->GetFormat(j) == defaultFormat) {
mPluginIndex = i; mPluginIndex = i;
mSubFormatIndex = j; mSubFormatIndex = j;
@ -244,7 +242,6 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
mSubFormatIndex = 0; mSubFormatIndex = 0;
} }
S.SetBorder(5); S.SetBorder(5);
S.StartHorizontalLay(wxEXPAND, true); S.StartHorizontalLay(wxEXPAND, true);
{ {
@ -261,19 +258,10 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
S.Id(ChooseID).AddButton(_("Choose...")); S.Id(ChooseID).AddButton(_("Choose..."));
S.Id(CreateID).AddButton(_("Create")); S.Id(CreateID).AddButton(_("Create"));
wxArrayString formats;
for (size_t i = 0; i < mPlugins.GetCount(); i++) {
for (int j = 0; j < mPlugins[i]->GetFormatCount(); j++)
{
formats.Add(mPlugins[i]->GetDescription(j));
}
}
mFormat = S.Id(FormatID) mFormat = S.Id(FormatID)
.TieChoice(_("Format:"), .TieChoice(_("Format:"),
wxT("/Export/MultipleFormat"), wxT("/Export/MultipleFormat"),
mPlugins[mPluginIndex]->GetFormat(mSubFormatIndex), formats[mFilterIndex],
formats, formats,
formats); formats);
S.AddVariableText(wxT(""), false); S.AddVariableText(wxT(""), false);