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

Bug 2343 - Presets: Effect Ids not the same in Presets as for Macros

Browse Source
This commit is contained in:
James Crook 2020-03-05 22:14:17 +00:00
parent 301c511422
commit 95bbe617b8
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/effects/Effect.cpp
View File

@ -35,6 +35,7 @@
#include "../Shuttle.h" #include "../Shuttle.h"
#include "../ViewInfo.h" #include "../ViewInfo.h"
#include "../WaveTrack.h" #include "../WaveTrack.h"
#include "../Effects/EffectManager.h"
#include "../wxFileNameWrapper.h" #include "../wxFileNameWrapper.h"
#include "../widgets/ProgressDialog.h" #include "../widgets/ProgressDialog.h"
#include "../ondemand/ODManager.h" #include "../ondemand/ODManager.h"
@ -666,7 +667,9 @@ void Effect::ExportPresets()
{ {
wxString params; wxString params;
GetAutomationParameters(params); GetAutomationParameters(params);
params = GetSymbol().Internal() + ":" + params; EffectManager & em = EffectManager::Get();
wxString commandId = em.GetSquashedName(GetSymbol().Internal()).GET();
params = commandId + ":" + params;
auto path = FileNames::DefaultToDocumentsFolder(wxT("Presets/Path")); auto path = FileNames::DefaultToDocumentsFolder(wxT("Presets/Path"));
@ -741,7 +744,11 @@ void Effect::ImportPresets()
if (f.ReadAll(&params)) { if (f.ReadAll(&params)) {
wxString ident = params.BeforeFirst(':'); wxString ident = params.BeforeFirst(':');
params = params.AfterFirst(':'); params = params.AfterFirst(':');
if (ident != GetSymbol().Internal()) {
EffectManager & em = EffectManager::Get();
wxString commandId = em.GetSquashedName(GetSymbol().Internal()).GET();
if (ident != commandId) {
// effect identifiers are a sensible length! // effect identifiers are a sensible length!
// must also have some params. // must also have some params.
if ((params.Length() < 2 ) || (ident.Length() < 2) || (ident.Length() > 30)) if ((params.Length() < 2 ) || (ident.Length() < 2) || (ident.Length() > 30))

4
src/effects/EffectManager.cpp
View File

@ -122,7 +122,11 @@ TranslatableString EffectManager::GetVendorName(const PluginID & ID)
CommandID EffectManager::GetCommandIdentifier(const PluginID & ID) CommandID EffectManager::GetCommandIdentifier(const PluginID & ID)
{ {
wxString name = PluginManager::Get().GetSymbol(ID).Internal(); wxString name = PluginManager::Get().GetSymbol(ID).Internal();
return GetSquashedName(name);
}
CommandID EffectManager::GetSquashedName(wxString name)
{
// Get rid of leading and trailing white space // Get rid of leading and trailing white space
name.Trim(true).Trim(false); name.Trim(true).Trim(false);

1
src/effects/EffectManager.h
View File

@ -94,6 +94,7 @@ public:
ComponentInterfaceSymbol GetCommandSymbol(const PluginID & ID); ComponentInterfaceSymbol GetCommandSymbol(const PluginID & ID);
TranslatableString GetCommandName(const PluginID & ID); TranslatableString GetCommandName(const PluginID & ID);
CommandID GetCommandIdentifier(const PluginID & ID); CommandID GetCommandIdentifier(const PluginID & ID);
CommandID GetSquashedName(wxString name);
TranslatableString GetCommandDescription(const PluginID & ID); TranslatableString GetCommandDescription(const PluginID & ID);
wxString GetCommandUrl(const PluginID & ID); wxString GetCommandUrl(const PluginID & ID);
wxString GetCommandTip(const PluginID & ID); wxString GetCommandTip(const PluginID & ID);