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

Avoid extra indirection in FormatList

Browse Source
This commit is contained in:
Paul Licameli 2016-02-19 10:59:51 -05:00
parent 00db530c9b
commit 8e995d66d0
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BatchProcessDialog.cpp
View File

@ -241,10 +241,9 @@ void BatchProcessDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
wxString filter; wxString filter;
wxString all; wxString all;
l.DeleteContents(true);
Importer::Get().GetSupportedImportFormats(&l); Importer::Get().GetSupportedImportFormats(&l);
for (FormatList::compatibility_iterator n = l.GetFirst(); n; n = n->GetNext()) { for (const auto &format : l) {
Format *f = n->GetData(); const Format *f = &format;
wxString newfilter = f->formatName + wxT("|"); wxString newfilter = f->formatName + wxT("|");
for (size_t i = 0; i < f->formatExtensions.size(); i++) { for (size_t i = 0; i < f->formatExtensions.size(); i++) {

5
src/Project.cpp
View File

@ -2413,12 +2413,11 @@ wxArrayString AudacityProject::ShowOpenDialog(wxString extraformat, wxString ext
} }
// Construct the filter // Construct the filter
l.DeleteContents(true);
Importer::Get().GetSupportedImportFormats(&l); Importer::Get().GetSupportedImportFormats(&l);
for (FormatList::compatibility_iterator n = l.GetFirst(); n; n = n->GetNext()) { for (const auto &format : l) {
/* this loop runs once per supported _format_ */ /* this loop runs once per supported _format_ */
Format *f = n->GetData(); const Format *f = &format;
wxString newfilter = f->formatName + wxT("|"); wxString newfilter = f->formatName + wxT("|");
// bung format name into string plus | separator // bung format name into string plus | separator

5
src/import/Import.cpp
View File

@ -62,7 +62,6 @@ and ImportLOF.cpp.
WX_DEFINE_LIST(ImportPluginList); WX_DEFINE_LIST(ImportPluginList);
WX_DEFINE_LIST(UnusableImportPluginList); WX_DEFINE_LIST(UnusableImportPluginList);
WX_DEFINE_LIST(FormatList);
WX_DEFINE_OBJARRAY(ExtImportItems); WX_DEFINE_OBJARRAY(ExtImportItems);
// ============================================================================ // ============================================================================
@ -138,8 +137,8 @@ void Importer::GetSupportedImportFormats(FormatList *formatList)
while(importPluginNode) while(importPluginNode)
{ {
ImportPlugin *importPlugin = importPluginNode->GetData(); ImportPlugin *importPlugin = importPluginNode->GetData();
formatList->Append(new Format(importPlugin->GetPluginFormatDescription(), formatList->emplace_back(importPlugin->GetPluginFormatDescription(),
importPlugin->GetSupportedExtensions())); importPlugin->GetSupportedExtensions());
importPluginNode = importPluginNode->GetNext(); importPluginNode = importPluginNode->GetNext();
} }
} }

5
src/import/Import.h
View File

@ -11,10 +11,9 @@
#ifndef _IMPORT_ #ifndef _IMPORT_
#define _IMPORT_ #define _IMPORT_
#include <vector>
#include <wx/arrstr.h> #include <wx/arrstr.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/list.h>
#include <wx/listimpl.cpp>
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/listbox.h> #include <wx/listbox.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
@ -41,7 +40,7 @@ public:
class ExtImportItem; class ExtImportItem;
WX_DECLARE_LIST(Format, FormatList); using FormatList = std::vector<Format> ;
WX_DEFINE_ARRAY_PTR(ImportPlugin *, ImportPluginPtrArray); WX_DEFINE_ARRAY_PTR(ImportPlugin *, ImportPluginPtrArray);
WX_DECLARE_OBJARRAY(ExtImportItem, ExtImportItems); WX_DECLARE_OBJARRAY(ExtImportItem, ExtImportItems);