1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 07:40:23 +02:00

Don't discard override filter with default rule. Don't override it with MP3 if a file is mp3

This commit is contained in:
LRN1986 2010-04-21 13:42:51 +00:00
parent 2e4d2f1132
commit f89f540fb1

View File

@ -418,7 +418,8 @@ int Importer::Import(wxString fName,
if (!foundItem || (usersSelectionOverrides && !foundOverride))
{
bool prioritizeMp3 = false;
importPlugins.Clear();
if (usersSelectionOverrides && !foundOverride)
importPlugins.Clear();
wxLogMessage(wxT("Applying default rule"));
// Special treatment for mp3 files
if (wxMatchWild (wxT("*.mp3"),fName.Lower(), false))
@ -438,8 +439,16 @@ int Importer::Import(wxString fName,
}
else if (prioritizeMp3)
{
wxLogMessage(wxT("Inserting %s at 0"),plugin->GetPluginStringID().c_str());
importPlugins.Insert((size_t) 0, plugin);
if (usersSelectionOverrides)
{
wxLogMessage(wxT("Inserting %s at 1"),plugin->GetPluginStringID().c_str());
importPlugins.Insert((size_t) 1, plugin);
}
else
{
wxLogMessage(wxT("Inserting %s at 0"),plugin->GetPluginStringID().c_str());
importPlugins.Insert((size_t) 0, plugin);
}
}
}
importPluginNode = importPluginNode->GetNext();