Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-05 16:43:52 +01:00
Code Issues Releases Wiki Activity

Rewrite sort comparisons for plugin menus...

Browse Source 
... Don't concatenate strings just to compare.  Just do easy tuple comparisons.

Results might be different in case one plugin's symbol name, vendor, or family
is a prefix of the other one's.
This commit is contained in:
Paul Licameli
2020-05-22 16:26:20 -04:00
parent c941647db6
commit 9c196860db
1 changed files with 42 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/menus/PluginMenus.cpp
View File

@@ -41,121 +41,90 @@ void DoManagePluginsMenu(AudacityProject &project, EffectType type)
bool CompareEffectsByName(const PluginDescriptor *a, const PluginDescriptor *b)
{
auto akey = a->GetSymbol().Translation();
auto bkey = b->GetSymbol().Translation();
akey += a->GetPath();
bkey += b->GetPath();
return akey.CmpNoCase(bkey) < 0;
return
std::make_pair( a->GetSymbol().Translation(), a->GetPath() ) <
std::make_pair( b->GetSymbol().Translation(), b->GetPath() );
}
bool CompareEffectsByPublisher(
const PluginDescriptor *a, const PluginDescriptor *b)
{
auto &em = EffectManager::Get();
auto akey = em.GetVendorName(a->GetID()).Translation();
auto bkey = em.GetVendorName(b->GetID()).Translation();
auto akey = em.GetVendorName(a->GetID());
auto bkey = em.GetVendorName(b->GetID());
if (akey.empty())
{
akey = _("Uncategorized");
}
akey = XO("Uncategorized");
if (bkey.empty())
{
bkey = _("Uncategorized");
}
bkey = XO("Uncategorized");
akey += a->GetSymbol().Translation();
bkey += b->GetSymbol().Translation();
akey += a->GetPath();
bkey += b->GetPath();
return akey.CmpNoCase(bkey) < 0;
return
std::make_tuple(
akey.Translation(), a->GetSymbol().Translation(), a->GetPath() ) <
std::make_tuple(
bkey.Translation(), b->GetSymbol().Translation(), b->GetPath() );
}
bool CompareEffectsByPublisherAndName(
const PluginDescriptor *a, const PluginDescriptor *b)
{
auto &em = EffectManager::Get();
auto akey = em.GetVendorName(a->GetID()).Translation();
auto bkey = em.GetVendorName(b->GetID()).Translation();
auto akey = em.GetVendorName(a->GetID());
auto bkey = em.GetVendorName(b->GetID());
if (a->IsEffectDefault())
{
akey = wxEmptyString;
}
akey = {};
if (b->IsEffectDefault())
{
bkey = wxEmptyString;
}
bkey = {};
akey += a->GetSymbol().Translation();
bkey += b->GetSymbol().Translation();
akey += a->GetPath();
bkey += b->GetPath();
return akey.CmpNoCase(bkey) < 0;
return
std::make_tuple(
akey.Translation(), a->GetSymbol().Translation(), a->GetPath() ) <
std::make_tuple(
bkey.Translation(), b->GetSymbol().Translation(), b->GetPath() );
}
bool CompareEffectsByTypeAndName(
const PluginDescriptor *a, const PluginDescriptor *b)
{
auto &em = EffectManager::Get();
auto akey = em.GetEffectFamilyName(a->GetID()).Translation();
auto bkey = em.GetEffectFamilyName(b->GetID()).Translation();
auto akey = em.GetEffectFamilyName(a->GetID());
auto bkey = em.GetEffectFamilyName(b->GetID());
if (akey.empty())
{
akey = _("Uncategorized");
}
akey = XO("Uncategorized");
if (bkey.empty())
{
bkey = _("Uncategorized");
}
bkey = XO("Uncategorized");
if (a->IsEffectDefault())
{
akey = wxEmptyString;
}
akey = {};
if (b->IsEffectDefault())
{
bkey = wxEmptyString;
}
bkey = {};
akey += a->GetSymbol().Translation();
bkey += b->GetSymbol().Translation();
akey += a->GetPath();
bkey += b->GetPath();
return akey.CmpNoCase(bkey) < 0;
return
std::make_tuple(
akey.Translation(), a->GetSymbol().Translation(), a->GetPath() ) <
std::make_tuple(
bkey.Translation(), b->GetSymbol().Translation(), b->GetPath() );
}
bool CompareEffectsByType(const PluginDescriptor *a, const PluginDescriptor *b)
{
auto &em = EffectManager::Get();
auto akey = em.GetEffectFamilyName(a->GetID()).Translation();
auto bkey = em.GetEffectFamilyName(b->GetID()).Translation();
auto akey = em.GetEffectFamilyName(a->GetID());
auto bkey = em.GetEffectFamilyName(b->GetID());
if (akey.empty())
{
akey = _("Uncategorized");
}
akey = XO("Uncategorized");
if (bkey.empty())
{
bkey = _("Uncategorized");
}
bkey = XO("Uncategorized");
akey += a->GetSymbol().Translation();
bkey += b->GetSymbol().Translation();
akey += a->GetPath();
bkey += b->GetPath();
return akey.CmpNoCase(bkey) < 0;
return
std::make_tuple(
akey.Translation(), a->GetSymbol().Translation(), a->GetPath() ) <
std::make_tuple(
bkey.Translation(), b->GetSymbol().Translation(), b->GetPath() );
}
// Forward-declared function has its definition below with OnEffect in view