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

AUP3: "All supported files" filter missing AUP3 extension

Browse Source
This commit is contained in:
Leland Lucius 2020-07-17 20:44:03 -05:00
parent 1f87d4f716
commit df4f3bd4e2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ProjectManager.cpp
View File

@ -871,7 +871,7 @@ void ProjectManager::OnOpenAudioFile(wxCommandEvent & event)
void ProjectManager::OpenFiles(AudacityProject *proj)
{
auto selectedFiles =
ProjectFileManager::ShowOpenDialog( FileNames::AudacityProjects );
ProjectFileManager::ShowOpenDialog();
if (selectedFiles.size() == 0) {
Importer::SetLastOpenType({});
return;

15
src/import/Import.cpp
View File

@ -181,14 +181,13 @@ Importer::GetFileTypes( const FileNames::FileType &extraType )
FileNames::FileTypes fileTypes{
FileNames::AllFiles,
// Will fill in the list of extensions later:
{ XO("All supported files"), {} }
{ XO("All supported files"), {} },
FileNames::AudacityProjects
};
if ( !extraType.extensions.empty() )
fileTypes.push_back( extraType );
else
fileTypes.push_back(FileNames::AudacityProjects);
FileNames::FileTypes l;
for(const auto &importPlugin : sImportPluginList())
{
@ -196,8 +195,14 @@ Importer::GetFileTypes( const FileNames::FileType &extraType )
importPlugin->GetSupportedExtensions());
}
FileExtensions extraExtensions = FileNames::AudacityProjects.extensions;
extraExtensions.insert(extraExtensions.end(),
extraType.extensions.begin(),
extraType.extensions.end());
using ExtensionSet = std::unordered_set< FileExtension >;
FileExtensions allList = extraType.extensions, newList;
FileExtensions allList = FileNames::AudacityProjects.extensions, newList;
allList.insert(allList.end(), extraType.extensions.begin(), extraType.extensions.end());
ExtensionSet allSet{ allList.begin(), allList.end() }, newSet;
for ( const auto &format : l ) {
newList.clear();