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

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

Browse Source
This commit is contained in:
LRN1986 2010-04-21 13:42:51 +00:00
parent 2e4d2f1132
commit f89f540fb1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/import/Import.cpp
View File

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