audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use IdentInterfaceSymbol to identify commands and effects

This commit is contained in:
Paul Licameli 2018-03-09 13:11:20 -05:00
parent 11d217076a
commit b200819f75
116 changed files with 239 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/audacity/IdentInterface.h
View File

@ -109,13 +109,10 @@ public:
// These should return an untranslated value
virtual wxString GetPath() = 0;
// This string persists in configuration files
// So config compatibility will break if it is changed across Audacity versions
virtual wxString GetSymbol() = 0;
// These should return an untranslated value whose translation
// will be determined at runtime (if available)
virtual wxString GetName() = 0;
// The internal string persists in configuration files
// So config compatibility will break if it is changed across Audacity versions
virtual IdentInterfaceSymbol GetSymbol() = 0;
virtual IdentInterfaceSymbol GetVendor() = 0;

14
src/PluginManager.cpp
View File

@ -1845,7 +1845,7 @@ bool PluginManager::DropFile(const wxString &fileName)
auto &id = PluginManagerInterface::DefaultRegistrationCallback(
provider, ident);
ids.push_back(id);
names.push_back( wxGetTranslation( ident->GetName() ) );
names.push_back( ident->GetSymbol().Translation() );
return id;
});
if ( ! nPlugIns ) {
@ -2609,7 +2609,7 @@ PluginID PluginManager::GetID(ModuleInterface *module)
GetPluginTypeString(PluginTypeModule),
wxEmptyString,
module->GetVendor().Internal(),
module->GetName(),
module->GetSymbol().Translation(),
module->GetPath());
}
@ -2619,7 +2619,7 @@ PluginID PluginManager::GetID(CommandDefinitionInterface *command)
GetPluginTypeString(PluginTypeAudacityCommand),
wxEmptyString,
command->GetVendor().Internal(),
command->GetName(),
command->GetSymbol().Translation(),
command->GetPath());
}
@ -2629,7 +2629,7 @@ PluginID PluginManager::GetID(EffectDefinitionInterface *effect)
GetPluginTypeString(PluginTypeEffect),
effect->GetFamilyId().Internal(),
effect->GetVendor().Internal(),
effect->GetName(),
effect->GetSymbol().Translation(),
effect->GetPath());
}
@ -2639,7 +2639,7 @@ PluginID PluginManager::GetID(ImporterInterface *importer)
GetPluginTypeString(PluginTypeImporter),
wxEmptyString,
importer->GetVendor().Internal(),
importer->GetName(),
importer->GetSymbol().Translation(),
importer->GetPath());
}
@ -2689,7 +2689,7 @@ PluginDescriptor & PluginManager::CreatePlugin(const PluginID & id,
plug.SetID(id);
plug.SetPath(ident->GetPath());
plug.SetSymbol( { ident->GetSymbol(), ident->GetName() } );
plug.SetSymbol(ident->GetSymbol());
plug.SetVendor(ident->GetVendor().Internal());
plug.SetVersion(ident->GetVersion());
@ -3150,5 +3150,5 @@ int PluginManager::b64decode(const wxString &in, void *out)
// #include directives.
const wxString& IdentInterface::GetTranslatedName()
{
return wxGetTranslation( GetName() );
return GetSymbol().Translation();
}

3
src/commands/AudacityCommand.cpp
View File

@ -81,8 +81,7 @@ AudacityCommand::~AudacityCommand()
}
wxString AudacityCommand::GetPath(){ return BUILTIN_GENERIC_COMMAND_PREFIX + GetSymbol();}
wxString AudacityCommand::GetName(){ return GetSymbol();}
wxString AudacityCommand::GetPath(){ return BUILTIN_GENERIC_COMMAND_PREFIX + GetSymbol().Internal(); }
IdentInterfaceSymbol AudacityCommand::GetVendor(){ return XO("Audacity");}
wxString AudacityCommand::GetVersion(){ return AUDACITY_VERSION_STRING;}

4
src/commands/AudacityCommand.h
View File

@ -64,14 +64,12 @@ class AUDACITY_DLL_API AudacityCommand /* not final */ : public wxEvtHandler,
//These four can be defaulted....
wxString GetPath() override;
wxString GetName() override;
IdentInterfaceSymbol GetVendor() override;
wxString GetVersion() override;
// virtual wxString GetFamily();
//These two must be implemented by instances.
virtual wxString GetSymbol() override
{ wxFAIL_MSG( "Implement a Symbol for this command");return "FAIL";};
IdentInterfaceSymbol GetSymbol() override = 0;
virtual wxString GetDescription() override
{wxFAIL_MSG( "Implement a Description for this command");return "FAIL";};

2
src/commands/CommandDirectory.cpp
View File

@ -81,7 +81,7 @@ void CommandDirectory::AddCommand(movable_ptr<OldStyleCommandType> &&type)
{
wxASSERT(type != NULL);
// Internal string is shown but only in assertion message
auto cmdName = type->GetName();
auto cmdName = type->GetSymbol().Internal();
wxASSERT_MSG(mCmdMap.find(cmdName) == mCmdMap.end()
, wxT("A command named ") + cmdName
+ wxT(" already exists."));

6
src/commands/CommandType.cpp
View File

@ -31,11 +31,11 @@ OldStyleCommandType::~OldStyleCommandType()
{
}
wxString OldStyleCommandType::GetName()
IdentInterfaceSymbol OldStyleCommandType::GetSymbol()
{
if (mSymbol.empty())
mSymbol = BuildName();
return mSymbol.Internal();
return mSymbol;
}
CommandSignature &OldStyleCommandType::GetSignature()
@ -52,7 +52,7 @@ wxString OldStyleCommandType::Describe()
{
// PRL: Is this intended for end-user visibility or just debugging? It did not
// use _(""), so I assume it is meant to use internal strings
wxString desc = GetName() + wxT("\nParameters:");
wxString desc = GetSymbol().Internal() + wxT("\nParameters:");
GetSignature();
ParamValueMap::iterator iter;
ParamValueMap defaults = mSignature->GetDefaults();

2
src/commands/CommandType.h
View File

@ -50,7 +50,7 @@ private:
public:
OldStyleCommandType();
virtual ~OldStyleCommandType();
wxString GetName() override;
IdentInterfaceSymbol GetSymbol() override;
CommandSignature &GetSignature();
wxString Describe(); // for debugging only ?

4
src/commands/CompareAudioCommand.h
View File

@ -23,13 +23,13 @@ classes
class WaveTrack;
#define COMPARE_AUDIO_PLUGIN_SYMBOL XO("Compare Audio")
#define COMPARE_AUDIO_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Compare Audio") }
class CompareAudioCommand final : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return XO("Compare Audio");}
IdentInterfaceSymbol GetSymbol() override {return XO("Compare Audio");}
wxString GetDescription() override {return _("Compares a range on two tracks.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/Demo.h
View File

@ -20,13 +20,13 @@
class ShuttleGui;
#define DEMO_PLUGIN_SYMBOL XO("Demo")
#define DEMO_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Demo") }
class DemoCommand final : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return DEMO_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return DEMO_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Does the demo action.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/DragCommand.h
View File

@ -19,14 +19,14 @@
#include "Command.h"
#include "CommandType.h"
#define DRAG_PLUGIN_SYMBOL XO("Drag")
#define DRAG_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Drag") }
class DragCommand : public AudacityCommand
{
public:
DragCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return DRAG_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return DRAG_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Drags mouse from one place to another.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/GetInfoCommand.h
View File

@ -26,13 +26,13 @@ channel.
class wxMenuBar;
class wxPoint;
#define GET_INFO_PLUGIN_SYMBOL XO("Get Info")
#define GET_INFO_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Get Info") }
class GetInfoCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return GET_INFO_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return GET_INFO_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Gets information in JSON format.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/GetTrackInfoCommand.h
View File

@ -19,14 +19,14 @@
#include "Command.h"
#include "CommandType.h"
#define GET_TRACK_INFO_PLUGIN_SYMBOL XO("Get Track Info")
#define GET_TRACK_INFO_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Get Track Info") }
class GetTrackInfoCommand final : public AudacityCommand
{
public:
GetTrackInfoCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return GET_TRACK_INFO_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return GET_TRACK_INFO_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Gets track values as JSON.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/HelpCommand.h
View File

@ -23,13 +23,13 @@
#include "CommandType.h"
#include "Command.h"
#define HELP_PLUGIN_SYMBOL XO("Help")
#define HELP_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Help") }
class HelpCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return HELP_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return HELP_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Gives help on a command.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

8
src/commands/ImportExportCommands.h
View File

@ -23,13 +23,13 @@
// Import
#define IMPORT_PLUGIN_SYMBOL XO("Import2")
#define IMPORT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Import2") }
class ImportCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return IMPORT_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return IMPORT_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Imports from a file.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -41,13 +41,13 @@ public:
wxString mFileName;
};
#define EXPORT_PLUGIN_SYMBOL XO("Export2")
#define EXPORT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Export2") }
class ExportCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return EXPORT_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return EXPORT_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Exports to a file.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

9
src/commands/LoadCommands.cpp
View File

@ -100,7 +100,7 @@ enum
// Redefine COMMAND() to add the COMMAND's name to an array
//
#undef COMMAND
#define COMMAND(n, i, args) n ## _PLUGIN_SYMBOL,
#define COMMAND(n, i, args) (n ## _PLUGIN_SYMBOL).Internal(),
//
// Create the COMMAND name array
@ -176,12 +176,7 @@ wxString BuiltinCommandsModule::GetPath()
return mPath;
}
wxString BuiltinCommandsModule::GetSymbol()
{
return XO("Builtin Commands");
}
wxString BuiltinCommandsModule::GetName()
IdentInterfaceSymbol BuiltinCommandsModule::GetSymbol()
{
return XO("Builtin Commands");
}

3
src/commands/LoadCommands.h
View File

@ -31,8 +31,7 @@ public:
// IdentInterface implementation
wxString GetPath() override;
wxString GetSymbol() override;
wxString GetName() override;
IdentInterfaceSymbol GetSymbol() override;
IdentInterfaceSymbol GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;

4
src/commands/MessageCommand.h
View File

@ -24,13 +24,13 @@
#include "CommandType.h"
#include "Command.h"
#define MESSAGE_PLUGIN_SYMBOL XO("Message")
#define MESSAGE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Message") }
class MessageCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return MESSAGE_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return MESSAGE_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Echos a message.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

8
src/commands/OpenSaveCommands.h
View File

@ -21,13 +21,13 @@
#include "Command.h"
#include "CommandType.h"
#define OPEN_PROJECT_PLUGIN_SYMBOL XO("Open Project2")
#define OPEN_PROJECT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Open Project2") }
class OpenProjectCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return OPEN_PROJECT_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return OPEN_PROJECT_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Opens a project.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -41,13 +41,13 @@ public:
bool bHasAddToHistory;
};
#define SAVE_PROJECT_PLUGIN_SYMBOL XO("Save Project2")
#define SAVE_PROJECT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Save Project2") }
class SaveProjectCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SAVE_PROJECT_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SAVE_PROJECT_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Saves a project.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

8
src/commands/PreferenceCommands.h
View File

@ -26,14 +26,14 @@
// GetPreference
#define GET_PREFERENCE_PLUGIN_SYMBOL XO("Get Preference")
#define SET_PREFERENCE_PLUGIN_SYMBOL XO("Set Preference")
#define GET_PREFERENCE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Get Preference") }
#define SET_PREFERENCE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Preference") }
class GetPreferenceCommand final : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return GET_PREFERENCE_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return GET_PREFERENCE_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Gets the value of a single preference.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -51,7 +51,7 @@ class SetPreferenceCommand final : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_PREFERENCE_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_PREFERENCE_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets the value of a single preference.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/ScreenshotCommand.h
View File

@ -28,7 +28,7 @@ class AdornedRulerPanel;
class AudacityProject;
class CommandContext;
#define SCREENSHOT_PLUGIN_SYMBOL XO("Screenshot")
#define SCREENSHOT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Screenshot") }
class ScreenshotCommand : public AudacityCommand
{
@ -80,7 +80,7 @@ public:
ScreenshotCommand(){ mbBringToTop=true;};
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SCREENSHOT_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SCREENSHOT_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Takes screenshots.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

16
src/commands/SelectCommand.h
View File

@ -25,16 +25,16 @@
//#include "../commands/AudacityCommand.h"
#define SELECT_TIME_PLUGIN_SYMBOL XO("Select Time")
#define SELECT_FREQUENCIES_PLUGIN_SYMBOL XO("Select Frequencies")
#define SELECT_TRACKS_PLUGIN_SYMBOL XO("Select Tracks")
#define SELECT_PLUGIN_SYMBOL XO("Select")
#define SELECT_TIME_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Select Time") }
#define SELECT_FREQUENCIES_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Select Frequencies") }
#define SELECT_TRACKS_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Select Tracks") }
#define SELECT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Select") }
class SelectTimeCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SELECT_TIME_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SELECT_TIME_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Selects a time range.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -58,7 +58,7 @@ class SelectFrequenciesCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SELECT_FREQUENCIES_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SELECT_FREQUENCIES_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Selects a frequency range.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -79,7 +79,7 @@ class SelectTracksCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SELECT_TRACKS_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SELECT_TRACKS_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Selects a range of tracks.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -101,7 +101,7 @@ class SelectCommand : public AudacityCommand
{
public:
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SELECT_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SELECT_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Selects Audio.");};
bool DefineParams( ShuttleParams & S ) override {
return

4
src/commands/SetClipCommand.h
View File

@ -20,14 +20,14 @@
#include "CommandType.h"
#include "SetTrackInfoCommand.h"
#define SET_CLIP_PLUGIN_SYMBOL XO("Set Clip")
#define SET_CLIP_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Clip") }
class SetClipCommand : public SetTrackBase
{
public:
SetClipCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_CLIP_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_CLIP_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets various values for a clip.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/SetEnvelopeCommand.h
View File

@ -20,14 +20,14 @@
#include "CommandType.h"
#include "SetTrackInfoCommand.h"
#define SET_ENVELOPE_PLUGIN_SYMBOL XO("Set Envelope")
#define SET_ENVELOPE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Envelope") }
class SetEnvelopeCommand : public SetTrackBase
{
public:
SetEnvelopeCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_ENVELOPE_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_ENVELOPE_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets an envelope point position.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/SetLabelCommand.h
View File

@ -19,14 +19,14 @@
#include "Command.h"
#include "CommandType.h"
#define SET_LABEL_PLUGIN_SYMBOL XO("Set Label")
#define SET_LABEL_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Label") }
class SetLabelCommand : public AudacityCommand
{
public:
SetLabelCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_LABEL_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_LABEL_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets various values for a label.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

4
src/commands/SetProjectCommand.h
View File

@ -20,14 +20,14 @@
#include "Command.h"
#include "CommandType.h"
#define SET_PROJECT_PLUGIN_SYMBOL XO("Set Project")
#define SET_PROJECT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Project") }
class SetProjectCommand : public AudacityCommand
{
public:
SetProjectCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_PROJECT_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_PROJECT_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets various values for a project.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;

16
src/commands/SetTrackInfoCommand.h
View File

@ -20,10 +20,10 @@
#include "Command.h"
#include "CommandType.h"
#define SET_TRACK_PLUGIN_SYMBOL XO("Set Track")
#define SET_TRACK_STATUS_PLUGIN_SYMBOL XO("Set Track Status")
#define SET_TRACK_AUDIO_PLUGIN_SYMBOL XO("Set Track Audio")
#define SET_TRACK_VISUALS_PLUGIN_SYMBOL XO("Set Track Visuals")
#define SET_TRACK_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Track") }
#define SET_TRACK_STATUS_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Track Status") }
#define SET_TRACK_AUDIO_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Track Audio") }
#define SET_TRACK_VISUALS_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Set Track Visuals") }
class Track;
@ -51,7 +51,7 @@ class SetTrackStatusCommand : public SetTrackBase
public:
//SetTrackStatusCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_TRACK_STATUS_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_TRACK_STATUS_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets various values for a track.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -76,7 +76,7 @@ class SetTrackAudioCommand : public SetTrackBase
public:
//SetTrackAudioCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_TRACK_AUDIO_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_TRACK_AUDIO_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets various values for a track.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -103,7 +103,7 @@ class SetTrackVisualsCommand : public SetTrackBase
public:
//SetTrackVisualsCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_TRACK_VISUALS_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_TRACK_VISUALS_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets various values for a track.");};
bool DefineParams( ShuttleParams & S ) override;
void PopulateOrExchange(ShuttleGui & S) override;
@ -140,7 +140,7 @@ class SetTrackCommand : public SetTrackBase
public:
SetTrackCommand();
// CommandDefinitionInterface overrides
wxString GetSymbol() override {return SET_TRACK_PLUGIN_SYMBOL;};
IdentInterfaceSymbol GetSymbol() override {return SET_TRACK_PLUGIN_SYMBOL;};
wxString GetDescription() override {return _("Sets various values for a track.");};
// AudacityCommand overrides
wxString ManualPage() override {return wxT("Extra_Menu:_Tools#set_track");};

2
src/effects/Amplify.cpp
View File

@ -80,7 +80,7 @@ EffectAmplify::~EffectAmplify()
// IdentInterface implementation
wxString EffectAmplify::GetSymbol()
IdentInterfaceSymbol EffectAmplify::GetSymbol()
{
return AMPLIFY_PLUGIN_SYMBOL;
}

4
src/effects/Amplify.h
View File

@ -23,7 +23,7 @@
#include "Effect.h"
#define AMPLIFY_PLUGIN_SYMBOL XO("Amplify")
#define AMPLIFY_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Amplify") }
class ShuttleGui;
@ -35,7 +35,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/AutoDuck.cpp
View File

@ -102,7 +102,7 @@ EffectAutoDuck::~EffectAutoDuck()
// IdentInterface implementation
wxString EffectAutoDuck::GetSymbol()
IdentInterfaceSymbol EffectAutoDuck::GetSymbol()
{
return AUTODUCK_PLUGIN_SYMBOL;
}

4
src/effects/AutoDuck.h
View File

@ -26,7 +26,7 @@ class ShuttleGui;
#define AUTO_DUCK_PANEL_NUM_CONTROL_POINTS 5
#define AUTODUCK_PLUGIN_SYMBOL XO("Auto Duck")
#define AUTODUCK_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Auto Duck") }
class EffectAutoDuck final : public Effect
{
@ -36,7 +36,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/BassTreble.cpp
View File

@ -79,7 +79,7 @@ EffectBassTreble::~EffectBassTreble()
// IdentInterface implementation
wxString EffectBassTreble::GetSymbol()
IdentInterfaceSymbol EffectBassTreble::GetSymbol()
{
return BASSTREBLE_PLUGIN_SYMBOL;
}

4
src/effects/BassTreble.h
View File

@ -23,7 +23,7 @@
class ShuttleGui;
#define BASSTREBLE_PLUGIN_SYMBOL XO("Bass and Treble")
#define BASSTREBLE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Bass and Treble") }
class EffectBassTrebleState
{
@ -47,7 +47,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/ChangePitch.cpp
View File

@ -115,7 +115,7 @@ EffectChangePitch::~EffectChangePitch()
// IdentInterface implementation
wxString EffectChangePitch::GetSymbol()
IdentInterfaceSymbol EffectChangePitch::GetSymbol()
{
return CHANGEPITCH_PLUGIN_SYMBOL;
}

4
src/effects/ChangePitch.h
View File

@ -36,7 +36,7 @@ the pitch without changing the tempo.
class ShuttleGui;
#define CHANGEPITCH_PLUGIN_SYMBOL XO("Change Pitch")
#define CHANGEPITCH_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Change Pitch") }
class EffectChangePitch final : public EffectSoundTouch
{
@ -46,7 +46,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/ChangeSpeed.cpp
View File

@ -105,7 +105,7 @@ EffectChangeSpeed::~EffectChangeSpeed()
// IdentInterface implementation
wxString EffectChangeSpeed::GetSymbol()
IdentInterfaceSymbol EffectChangeSpeed::GetSymbol()
{
return CHANGESPEED_PLUGIN_SYMBOL;
}

4
src/effects/ChangeSpeed.h
View File

@ -25,7 +25,7 @@
class ShuttleGui;
#define CHANGESPEED_PLUGIN_SYMBOL XO("Change Speed")
#define CHANGESPEED_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Change Speed") }
class EffectChangeSpeed final : public Effect
{
@ -35,7 +35,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/ChangeTempo.cpp
View File

@ -92,7 +92,7 @@ EffectChangeTempo::~EffectChangeTempo()
// IdentInterface implementation
wxString EffectChangeTempo::GetSymbol()
IdentInterfaceSymbol EffectChangeTempo::GetSymbol()
{
return CHANGETEMPO_PLUGIN_SYMBOL;
}

4
src/effects/ChangeTempo.h
View File

@ -30,7 +30,7 @@
class ShuttleGui;
#define CHANGETEMPO_PLUGIN_SYMBOL XO("Change Tempo")
#define CHANGETEMPO_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Change Tempo") }
class EffectChangeTempo final : public EffectSoundTouch
{
@ -40,7 +40,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/ClickRemoval.cpp
View File

@ -75,7 +75,7 @@ EffectClickRemoval::~EffectClickRemoval()
// IdentInterface implementation
wxString EffectClickRemoval::GetSymbol()
IdentInterfaceSymbol EffectClickRemoval::GetSymbol()
{
return CLICKREMOVAL_PLUGIN_SYMBOL;
}

4
src/effects/ClickRemoval.h
View File

@ -26,7 +26,7 @@
class Envelope;
class ShuttleGui;
#define CLICKREMOVAL_PLUGIN_SYMBOL XO("Click Removal")
#define CLICKREMOVAL_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Click Removal") }
class EffectClickRemoval final : public Effect
{
@ -36,7 +36,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Compressor.cpp
View File

@ -96,7 +96,7 @@ EffectCompressor::~EffectCompressor()
// IdentInterface implementation
wxString EffectCompressor::GetSymbol()
IdentInterfaceSymbol EffectCompressor::GetSymbol()
{
return COMPRESSOR_PLUGIN_SYMBOL;
}

4
src/effects/Compressor.h
View File

@ -27,7 +27,7 @@
class EffectCompressorPanel;
class ShuttleGui;
#define COMPRESSOR_PLUGIN_SYMBOL XO("Compressor")
#define COMPRESSOR_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Compressor") }
class EffectCompressor final : public EffectTwoPassSimpleMono
{
@ -38,7 +38,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Distortion.cpp
View File

@ -190,7 +190,7 @@ EffectDistortion::~EffectDistortion()
// IdentInterface implementation
wxString EffectDistortion::GetSymbol()
IdentInterfaceSymbol EffectDistortion::GetSymbol()
{
return DISTORTION_PLUGIN_SYMBOL;
}

4
src/effects/Distortion.h
View File

@ -23,7 +23,7 @@
class ShuttleGui;
#define DISTORTION_PLUGIN_SYMBOL XO("Distortion")
#define DISTORTION_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Distortion") }
#define STEPS 1024 // number of +ve or -ve steps in lookup tabe
#define TABLESIZE 2049 // size of lookup table (steps * 2 + 1)
@ -64,7 +64,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/DtmfGen.cpp
View File

@ -91,7 +91,7 @@ EffectDtmf::~EffectDtmf()
// IdentInterface implementation
wxString EffectDtmf::GetSymbol()
IdentInterfaceSymbol EffectDtmf::GetSymbol()
{
return DTMFTONES_PLUGIN_SYMBOL;
}

4
src/effects/DtmfGen.h
View File

@ -25,7 +25,7 @@
class ShuttleGui;
#define DTMFTONES_PLUGIN_SYMBOL XO("DTMF Tones")
#define DTMFTONES_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("DTMF Tones") }
class EffectDtmf final : public Effect
{
@ -35,7 +35,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Echo.cpp
View File

@ -52,7 +52,7 @@ EffectEcho::~EffectEcho()
// IdentInterface implementation
wxString EffectEcho::GetSymbol()
IdentInterfaceSymbol EffectEcho::GetSymbol()
{
return ECHO_PLUGIN_SYMBOL;
}

4
src/effects/Echo.h
View File

@ -21,7 +21,7 @@
class ShuttleGui;
#define ECHO_PLUGIN_SYMBOL XO("Echo")
#define ECHO_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Echo") }
class EffectEcho final : public Effect
{
@ -31,7 +31,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

16
src/effects/Effect.cpp
View File

@ -164,27 +164,17 @@ wxString Effect::GetPath()
return mClient->GetPath();
}
return BUILTIN_EFFECT_PREFIX + GetSymbol();
return BUILTIN_EFFECT_PREFIX + GetSymbol().Internal();
}
wxString Effect::GetSymbol()
IdentInterfaceSymbol Effect::GetSymbol()
{
if (mClient)
{
return mClient->GetSymbol();
}
return wxEmptyString;
}
wxString Effect::GetName()
{
if (mClient)
{
return mClient->GetName();
}
return GetSymbol();
return {};
}
IdentInterfaceSymbol Effect::GetVendor()

5
src/effects/Effect.h
View File

@ -80,11 +80,8 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler,
wxString GetPath() override;
// This string persists in configuration files
// So config compatibility will break if it is changed across Audacity versions
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetName() override;
IdentInterfaceSymbol GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;

2
src/effects/Equalization.cpp
View File

@ -282,7 +282,7 @@ EffectEqualization::~EffectEqualization()
// IdentInterface implementation
wxString EffectEqualization::GetSymbol()
IdentInterfaceSymbol EffectEqualization::GetSymbol()
{
return EQUALIZATION_PLUGIN_SYMBOL;
}

4
src/effects/Equalization.h
View File

@ -43,7 +43,7 @@
#include "../RealFFTf.h"
#include "../SampleFormat.h"
#define EQUALIZATION_PLUGIN_SYMBOL XO("Equalization")
#define EQUALIZATION_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Equalization") }
class Envelope;
@ -105,7 +105,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Fade.cpp
View File

@ -30,7 +30,7 @@ EffectFade::~EffectFade()
// IdentInterface implementation
wxString EffectFade::GetSymbol()
IdentInterfaceSymbol EffectFade::GetSymbol()
{
return mFadeIn
? FADEIN_PLUGIN_SYMBOL

6
src/effects/Fade.h
View File

@ -15,8 +15,8 @@
#include "Effect.h"
#define FADEIN_PLUGIN_SYMBOL XO("Fade In")
#define FADEOUT_PLUGIN_SYMBOL XO("Fade Out")
#define FADEIN_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Fade In") }
#define FADEOUT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Fade Out") }
class EffectFade final : public Effect
{
@ -26,7 +26,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
// EffectDefinitionInterface implementation

2
src/effects/FindClipping.cpp
View File

@ -52,7 +52,7 @@ EffectFindClipping::~EffectFindClipping()
// IdentInterface implementation
wxString EffectFindClipping::GetSymbol()
IdentInterfaceSymbol EffectFindClipping::GetSymbol()
{
return FINDCLIPPING_PLUGIN_SYMBOL;
}

4
src/effects/FindClipping.h
View File

@ -20,7 +20,7 @@ class LabelTrack;
#include "Effect.h"
#define FINDCLIPPING_PLUGIN_SYMBOL XO("Find Clipping")
#define FINDCLIPPING_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Find Clipping") }
class EffectFindClipping final : public Effect
{
@ -30,7 +30,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Invert.cpp
View File

@ -30,7 +30,7 @@ EffectInvert::~EffectInvert()
// IdentInterface implementation
wxString EffectInvert::GetSymbol()
IdentInterfaceSymbol EffectInvert::GetSymbol()
{
return INVERT_PLUGIN_SYMBOL;
}

4
src/effects/Invert.h
View File

@ -17,7 +17,7 @@
#include "Effect.h"
#define INVERT_PLUGIN_SYMBOL XO("Invert")
#define INVERT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Invert") }
class EffectInvert final : public Effect
{
@ -27,7 +27,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
// EffectDefinitionInterface implementation

9
src/effects/LoadEffects.cpp
View File

@ -164,7 +164,7 @@ enum
// Redefine EFFECT() to add the effect's name to an array
//
#undef EFFECT
#define EFFECT(n, i, args) n ## _PLUGIN_SYMBOL,
#define EFFECT(n, i, args) (n ## _PLUGIN_SYMBOL).Internal(),
//
// Create the effect name array
@ -239,12 +239,7 @@ wxString BuiltinEffectsModule::GetPath()
return mPath;
}
wxString BuiltinEffectsModule::GetSymbol()
{
return XO("Builtin Effects");
}
wxString BuiltinEffectsModule::GetName()
IdentInterfaceSymbol BuiltinEffectsModule::GetSymbol()
{
return XO("Builtin Effects");
}

3
src/effects/LoadEffects.h
View File

@ -30,8 +30,7 @@ public:
// IdentInterface implementation
wxString GetPath() override;
wxString GetSymbol() override;
wxString GetName() override;
IdentInterfaceSymbol GetSymbol() override;
IdentInterfaceSymbol GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;

2
src/effects/Noise.cpp
View File

@ -69,7 +69,7 @@ EffectNoise::~EffectNoise()
// IdentInterface implementation
wxString EffectNoise::GetSymbol()
IdentInterfaceSymbol EffectNoise::GetSymbol()
{
return NOISE_PLUGIN_SYMBOL;
}

4
src/effects/Noise.h
View File

@ -21,7 +21,7 @@
class ShuttleGui;
#define NOISE_PLUGIN_SYMBOL XO("Noise")
#define NOISE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Noise") }
class EffectNoise final : public Effect
{
@ -31,7 +31,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/NoiseReduction.cpp
View File

@ -429,7 +429,7 @@ EffectNoiseReduction::~EffectNoiseReduction()
// IdentInterface implementation
wxString EffectNoiseReduction::GetSymbol()
IdentInterfaceSymbol EffectNoiseReduction::GetSymbol()
{
return NOISEREDUCTION_PLUGIN_SYMBOL;
}

4
src/effects/NoiseReduction.h
View File

@ -17,7 +17,7 @@
#include "../MemoryX.h"
#define NOISEREDUCTION_PLUGIN_SYMBOL XO("Noise Reduction")
#define NOISEREDUCTION_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Noise Reduction") }
class EffectNoiseReduction final : public Effect {
public:
@ -29,7 +29,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
// EffectDefinitionInterface implementation

2
src/effects/NoiseRemoval.cpp
View File

@ -110,7 +110,7 @@ EffectNoiseRemoval::~EffectNoiseRemoval()
// IdentInterface implementation
wxString EffectNoiseRemoval::GetSymbol()
IdentInterfaceSymbol EffectNoiseRemoval::GetSymbol()
{
return XO("Noise Removal");
}

4
src/effects/NoiseRemoval.h
View File

@ -37,7 +37,7 @@ class wxTextCtrl;
#include "../RealFFTf.h"
#define NOISEREMOVAL_PLUGIN_SYMBOL XO("Noise Removal")
#define NOISEREMOVAL_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Noise Removal") }
class EffectNoiseRemoval final : public Effect
{
@ -47,7 +47,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
// EffectDefinitionInterface implementation

2
src/effects/Normalize.cpp
View File

@ -58,7 +58,7 @@ EffectNormalize::~EffectNormalize()
// IdentInterface implementation
wxString EffectNormalize::GetSymbol()
IdentInterfaceSymbol EffectNormalize::GetSymbol()
{
return NORMALIZE_PLUGIN_SYMBOL;
}

4
src/effects/Normalize.h
View File

@ -22,7 +22,7 @@
class ShuttleGui;
#define NORMALIZE_PLUGIN_SYMBOL XO("Normalize")
#define NORMALIZE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Normalize") }
class EffectNormalize final : public Effect
{
@ -32,7 +32,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Paulstretch.cpp
View File

@ -98,7 +98,7 @@ EffectPaulstretch::~EffectPaulstretch()
// IdentInterface implementation
wxString EffectPaulstretch::GetSymbol()
IdentInterfaceSymbol EffectPaulstretch::GetSymbol()
{
return PAULSTRETCH_PLUGIN_SYMBOL;
}

4
src/effects/Paulstretch.h
View File

@ -16,7 +16,7 @@
class ShuttleGui;
#define PAULSTRETCH_PLUGIN_SYMBOL XO("Paulstretch")
#define PAULSTRETCH_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Paulstretch") }
class EffectPaulstretch final : public Effect
{
@ -26,7 +26,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Phaser.cpp
View File

@ -99,7 +99,7 @@ EffectPhaser::~EffectPhaser()
// IdentInterface implementation
wxString EffectPhaser::GetSymbol()
IdentInterfaceSymbol EffectPhaser::GetSymbol()
{
return PHASER_PLUGIN_SYMBOL;
}

4
src/effects/Phaser.h
View File

@ -27,7 +27,7 @@ class ShuttleGui;
#define NUM_STAGES 24
#define PHASER_PLUGIN_SYMBOL XO("Phaser")
#define PHASER_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Phaser") }
class EffectPhaserState
{
@ -52,7 +52,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Repair.cpp
View File

@ -43,7 +43,7 @@ EffectRepair::~EffectRepair()
// IdentInterface implementation
wxString EffectRepair::GetSymbol()
IdentInterfaceSymbol EffectRepair::GetSymbol()
{
return REPAIR_PLUGIN_SYMBOL;
}

4
src/effects/Repair.h
View File

@ -15,7 +15,7 @@
#include "Effect.h"
#define REPAIR_PLUGIN_SYMBOL XO("Repair")
#define REPAIR_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Repair") }
class WaveTrack;
@ -27,7 +27,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
// EffectDefinitionInterface implementation

2
src/effects/Repeat.cpp
View File

@ -57,7 +57,7 @@ EffectRepeat::~EffectRepeat()
// IdentInterface implementation
wxString EffectRepeat::GetSymbol()
IdentInterfaceSymbol EffectRepeat::GetSymbol()
{
return REPEAT_PLUGIN_SYMBOL;
}

4
src/effects/Repeat.h
View File

@ -20,7 +20,7 @@
class ShuttleGui;
#define REPEAT_PLUGIN_SYMBOL XO("Repeat")
#define REPEAT_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Repeat") }
class EffectRepeat final : public Effect
{
@ -30,7 +30,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Reverb.cpp
View File

@ -130,7 +130,7 @@ EffectReverb::~EffectReverb()
// IdentInterface implementation
wxString EffectReverb::GetSymbol()
IdentInterfaceSymbol EffectReverb::GetSymbol()
{
return REVERB_PLUGIN_SYMBOL;
}

4
src/effects/Reverb.h
View File

@ -22,7 +22,7 @@
class ShuttleGui;
#define REVERB_PLUGIN_SYMBOL XO("Reverb")
#define REVERB_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Reverb") }
struct Reverb_priv_t;
@ -48,7 +48,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Reverse.cpp
View File

@ -38,7 +38,7 @@ EffectReverse::~EffectReverse()
// IdentInterface implementation
wxString EffectReverse::GetSymbol()
IdentInterfaceSymbol EffectReverse::GetSymbol()
{
return REVERSE_PLUGIN_SYMBOL;
}

4
src/effects/Reverse.h
View File

@ -17,7 +17,7 @@
#include "Effect.h"
#define REVERSE_PLUGIN_SYMBOL XO("Reverse")
#define REVERSE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Reverse") }
class EffectReverse final : public Effect
{
@ -27,7 +27,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
// EffectDefinitionInterface implementation

5
src/effects/SBSMSEffect.h
View File

@ -36,7 +36,10 @@ public:
protected:
wxString mProxyEffectName { XO("SBSMS Time / Pitch Stretch") };
wxString GetName() override { return mProxyEffectName; };
// This supplies the abstract virtual function, but in fact this symbol
// does not get used: this class is either a temporary helper, or else
// GetSymbol() is overridden further in derived classes.
IdentInterfaceSymbol GetSymbol() override { return mProxyEffectName; }
private:
bool ProcessLabelTrack(LabelTrack *track);

2
src/effects/ScienFilter.cpp
View File

@ -180,7 +180,7 @@ EffectScienFilter::~EffectScienFilter()
// IdentInterface implementation
wxString EffectScienFilter::GetSymbol()
IdentInterfaceSymbol EffectScienFilter::GetSymbol()
{
return CLASSICFILTERS_PLUGIN_SYMBOL;
}

4
src/effects/ScienFilter.h
View File

@ -31,7 +31,7 @@ Vaughan Johnson (Preview)
class wxTextCtrl;
class ShuttleGui;
#define CLASSICFILTERS_PLUGIN_SYMBOL XO("Classic Filters")
#define CLASSICFILTERS_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Classic Filters") }
class EffectScienFilterPanel;
@ -43,7 +43,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/Silence.cpp
View File

@ -32,7 +32,7 @@ EffectSilence::~EffectSilence()
// IdentInterface implementation
wxString EffectSilence::GetSymbol()
IdentInterfaceSymbol EffectSilence::GetSymbol()
{
return SILENCE_PLUGIN_SYMBOL;
}

4
src/effects/Silence.h
View File

@ -19,7 +19,7 @@
#include "Generator.h"
#define SILENCE_PLUGIN_SYMBOL XO("Silence")
#define SILENCE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Silence") }
class EffectSilence final : public Generator
{
@ -29,7 +29,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/SimpleMono.cpp
View File

@ -14,7 +14,7 @@
it gets at a time.
Your derived class only needs to implement
GetCommandName, GetEffectAction, and ProcessSimpleMono.
GetSymbol, GetEffectAction, and ProcessSimpleMono.
*//*******************************************************************/

2
src/effects/SimpleMono.h
View File

@ -10,7 +10,7 @@
monaural effect. Inherit from it if your effect doesn't just
modifies a track in place and doesn't care how many samples
it gets at a time. Your derived class only needs to implement
GetCommandName, GetEffectAction, and ProcessSimpleMono.
GetSymbol, GetEffectAction, and ProcessSimpleMono.
**********************************************************************/

2
src/effects/StereoToMono.cpp
View File

@ -31,7 +31,7 @@ EffectStereoToMono::~EffectStereoToMono()
// IdentInterface implementation
wxString EffectStereoToMono::GetSymbol()
IdentInterfaceSymbol EffectStereoToMono::GetSymbol()
{
return STEREOTOMONO_PLUGIN_SYMBOL;
}

4
src/effects/StereoToMono.h
View File

@ -15,7 +15,7 @@
#include "Effect.h"
#define STEREOTOMONO_PLUGIN_SYMBOL XO("Stereo To Mono")
#define STEREOTOMONO_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Stereo To Mono") }
class EffectStereoToMono final : public Effect
{
@ -25,7 +25,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
// EffectDefinitionInterface implementation

7
src/effects/TimeScale.cpp
View File

@ -84,16 +84,11 @@ EffectTimeScale::~EffectTimeScale()
// IdentInterface implementation
wxString EffectTimeScale::GetSymbol()
IdentInterfaceSymbol EffectTimeScale::GetSymbol()
{
return TIMESCALE_PLUGIN_SYMBOL;
}
wxString EffectTimeScale::GetName()
{
return XO("Sliding Time Scale/Pitch Shift");
}
wxString EffectTimeScale::GetDescription()
{
return _("Allows continuous changes to the tempo and/or pitch");

9
src/effects/TimeScale.h
View File

@ -24,7 +24,11 @@
class ShuttleGui;
#define TIMESCALE_PLUGIN_SYMBOL XO("Time Scale")
// two strings here
// unusual case
#define TIMESCALE_PLUGIN_SYMBOL \
IdentInterfaceSymbol{ wxT("Time Scale"), \
XO("Sliding Time Scale/Pitch Shift") }
class EffectTimeScale final : public EffectSBSMS
{
@ -34,8 +38,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
wxString GetName() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/ToneGen.cpp
View File

@ -111,7 +111,7 @@ EffectToneGen::~EffectToneGen()
// IdentInterface implementation
wxString EffectToneGen::GetSymbol()
IdentInterfaceSymbol EffectToneGen::GetSymbol()
{
return mChirp
? CHIRP_PLUGIN_SYMBOL

6
src/effects/ToneGen.h
View File

@ -22,8 +22,8 @@
class ShuttleGui;
#define CHIRP_PLUGIN_SYMBOL XO("Chirp")
#define TONE_PLUGIN_SYMBOL XO("Tone")
#define CHIRP_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Chirp") }
#define TONE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Tone") }
class EffectToneGen final : public Effect
{
@ -33,7 +33,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

2
src/effects/TruncSilence.cpp
View File

@ -151,7 +151,7 @@ EffectTruncSilence::~EffectTruncSilence()
// IdentInterface implementation
wxString EffectTruncSilence::GetSymbol()
IdentInterfaceSymbol EffectTruncSilence::GetSymbol()
{
return TRUNCATESILENCE_PLUGIN_SYMBOL;
}

4
src/effects/TruncSilence.h
View File

@ -29,7 +29,7 @@ class wxChoice;
class wxTextCtrl;
class wxCheckBox;
#define TRUNCATESILENCE_PLUGIN_SYMBOL XO("Truncate Silence")
#define TRUNCATESILENCE_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Truncate Silence") }
class RegionList;
@ -41,7 +41,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

34
src/effects/VST/VSTEffect.cpp
View File

@ -231,16 +231,11 @@ public:
return mPath;
}
wxString GetSymbol() override
IdentInterfaceSymbol GetSymbol() override
{
return mName;
}
wxString GetName() override
{
return GetSymbol();
}
IdentInterfaceSymbol GetVendor() override
{
return { mVendor };
@ -331,16 +326,11 @@ wxString VSTEffectsModule::GetPath()
return mPath;
}
wxString VSTEffectsModule::GetSymbol()
IdentInterfaceSymbol VSTEffectsModule::GetSymbol()
{
return XO("VST Effects");
}
wxString VSTEffectsModule::GetName()
{
return GetSymbol();
}
IdentInterfaceSymbol VSTEffectsModule::GetVendor()
{
return XO("The Audacity Team");
@ -577,7 +567,8 @@ unsigned VSTEffectsModule::DiscoverPluginsAtPath(
if (idCnt > 3)
{
progress.create( _("Scanning Shell VST"),
wxString::Format(_("Registering %d of %d: %-64.64s"), 0, idCnt, proc.GetName()),
wxString::Format(_("Registering %d of %d: %-64.64s"), 0, idCnt,
proc.GetSymbol().Translation()),
static_cast<int>(idCnt),
nullptr,
wxPD_APP_MODAL |
@ -651,7 +642,8 @@ unsigned VSTEffectsModule::DiscoverPluginsAtPath(
{
idNdx++;
cont = progress->Update(idNdx,
wxString::Format(_("Registering %d of %d: %-64.64s"), idNdx, idCnt, proc.GetName()));
wxString::Format(_("Registering %d of %d: %-64.64s"), idNdx, idCnt,
proc.GetSymbol().Translation() ));
}
if (!skip && cont)
@ -734,7 +726,7 @@ void VSTEffectsModule::Check(const wxChar *path)
{
out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyBegin, wxEmptyString);
out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyPath, effect.GetPath());
out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyName, effect.GetName());
out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyName, effect.GetSymbol().Internal());
out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyVendor,
effect.GetVendor().Internal());
out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyVersion, effect.GetVersion());
@ -1198,16 +1190,11 @@ wxString VSTEffect::GetPath()
return mPath;
}
wxString VSTEffect::GetSymbol()
IdentInterfaceSymbol VSTEffect::GetSymbol()
{
return mName;
}
wxString VSTEffect::GetName()
{
return GetSymbol();
}
IdentInterfaceSymbol VSTEffect::GetVendor()
{
return { mVendor };
@ -3634,7 +3621,8 @@ void VSTEffect::SaveXML(const wxFileName & fn)
xmlFile.WriteAttr(wxT("version"), wxT("2"));
xmlFile.StartTag(wxT("effect"));
xmlFile.WriteAttr(wxT("name"), GetName());
// Use internal name only in persistent information
xmlFile.WriteAttr(wxT("name"), GetSymbol().Internal());
xmlFile.WriteAttr(wxT("uniqueID"), mAEffect->uniqueID);
xmlFile.WriteAttr(wxT("version"), mAEffect->version);
xmlFile.WriteAttr(wxT("numParams"), mAEffect->numParams);
@ -3746,7 +3734,7 @@ bool VSTEffect::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
return false;
}
if (value != GetName())
if (value != GetSymbol().Internal())
{
wxString msg;
msg.Printf(_("This parameter file was saved from %s. Continue?"), value);

6
src/effects/VST/VSTEffect.h
View File

@ -88,8 +88,7 @@ class VSTEffect final : public wxEvtHandler,
// IdentInterface implementation
wxString GetPath() override;
wxString GetSymbol() override;
wxString GetName() override;
IdentInterfaceSymbol GetSymbol() override;
IdentInterfaceSymbol GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;
@ -382,8 +381,7 @@ public:
// IdentInterface implementation
wxString GetPath() override;
wxString GetSymbol() override;
wxString GetName() override;
IdentInterfaceSymbol GetSymbol() override;
IdentInterfaceSymbol GetVendor() override;
wxString GetVersion() override;
wxString GetDescription() override;

2
src/effects/Wahwah.cpp
View File

@ -90,7 +90,7 @@ EffectWahwah::~EffectWahwah()
// IdentInterface implementation
wxString EffectWahwah::GetSymbol()
IdentInterfaceSymbol EffectWahwah::GetSymbol()
{
return WAHWAH_PLUGIN_SYMBOL;
}

4
src/effects/Wahwah.h
View File

@ -25,7 +25,7 @@
class ShuttleGui;
#define WAHWAH_PLUGIN_SYMBOL XO("Wahwah")
#define WAHWAH_PLUGIN_SYMBOL IdentInterfaceSymbol{ XO("Wahwah") }
class EffectWahwahState
{
@ -49,7 +49,7 @@ public:
// IdentInterface implementation
wxString GetSymbol() override;
IdentInterfaceSymbol GetSymbol() override;
wxString GetDescription() override;
wxString ManualPage() override;

34
src/effects/audiounits/AudioUnitEffect.cpp
View File

@ -111,12 +111,7 @@ wxString AudioUnitEffectsModule::GetPath()
return mPath;
}
wxString AudioUnitEffectsModule::GetSymbol()
{
return wxT("Audio Unit Effects");
}
wxString AudioUnitEffectsModule::GetName()
IdentInterfaceSymbol AudioUnitEffectsModule::GetSymbol()
{
/* 18n-hint: Audio Unit is the name of an Apple audio software protocol */
return XO("Audio Unit Effects");
@ -885,16 +880,11 @@ wxString AudioUnitEffect::GetPath()
return mPath;
}
wxString AudioUnitEffect::GetSymbol()
IdentInterfaceSymbol AudioUnitEffect::GetSymbol()
{
return mName;
}
wxString AudioUnitEffect::GetName()
{
return GetSymbol();
}
IdentInterfaceSymbol AudioUnitEffect::GetVendor()
{
return { mVendor };
@ -1966,7 +1956,9 @@ bool AudioUnitEffect::SetRateAndChannels()
sizeof(Float64));
if (result != noErr)
{
wxPrintf("%ls Didn't accept sample rate on global\n", GetName().wx_str());
wxPrintf("%ls Didn't accept sample rate on global\n",
// Exposing internal name only in debug printf
GetSymbol().Internal().wx_str());
return false;
}
@ -1980,7 +1972,9 @@ bool AudioUnitEffect::SetRateAndChannels()
sizeof(Float64));
if (result != noErr)
{
wxPrintf("%ls Didn't accept sample rate on input\n", GetName().wx_str());
wxPrintf("%ls Didn't accept sample rate on input\n",
// Exposing internal name only in debug printf
GetSymbol().Internal().wx_str());
return false;
}
@ -1992,7 +1986,9 @@ bool AudioUnitEffect::SetRateAndChannels()
sizeof(AudioStreamBasicDescription));
if (result != noErr)
{
wxPrintf("%ls didn't accept stream format on input\n", GetName().wx_str());
wxPrintf("%ls didn't accept stream format on input\n",
// Exposing internal name only in debug printf
GetSymbol().Internal().wx_str());
return false;
}
}
@ -2007,7 +2003,9 @@ bool AudioUnitEffect::SetRateAndChannels()
sizeof(Float64));
if (result != noErr)
{
wxPrintf("%ls Didn't accept sample rate on output\n", GetName().wx_str());
wxPrintf("%ls Didn't accept sample rate on output\n",
// Exposing internal name only in debug printf
GetSymbol().Internal().wx_str());
return false;
}
@ -2021,7 +2019,9 @@ bool AudioUnitEffect::SetRateAndChannels()
if (result != noErr)
{
wxPrintf("%ls didn't accept stream format on output\n", GetName().wx_str());
wxPrintf("%ls didn't accept stream format on output\n",
// Exposing internal name only in debug printf
GetSymbol().Internal().wx_str());
return false;
}
}

Some files were not shown because too many files have changed in this diff Show More