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

Re-adding localized menu labels for effects 

If you can believe it, this whole big mess is
just to get localized effect labels back into
the menus.

I sure wish I'd had a little bit more time to
finish up all of the effects.  It sure would 
be a lot cleaner (code wise).
This commit is contained in:
lllucius 2014-12-15 21:54:23 +00:00
parent 431166561e
commit 16ca4f17eb
58 changed files with 292 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/audacity/IdentInterface.h
View File

@ -49,8 +49,13 @@ class AUDACITY_DLL_API IdentInterface
public:
virtual ~IdentInterface() {};
// These should return an untranslated value
virtual PluginID GetID() = 0;
virtual wxString GetPath() = 0;
virtual wxString GetSymbol() = 0;
// These should return an untranslated value whose translation
// will be determined at runtime (if available)
virtual wxString GetName() = 0;
virtual wxString GetVendor() = 0;
virtual wxString GetVersion() = 0;

2
locale/Makevars
View File

@ -8,7 +8,7 @@ subdir = po
top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=wxTRANSLATE
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding

151
src/PluginManager.cpp
View File

@ -824,31 +824,6 @@ PluginType PluginDescriptor::GetPluginType() const
return mPluginType;
}
const wxString & PluginDescriptor::GetPath() const
{
return mPath;
}
const wxString & PluginDescriptor::GetName() const
{
return mName;
}
const wxString & PluginDescriptor::GetVersion() const
{
return mVersion;
}
const wxString & PluginDescriptor::GetVendor() const
{
return mVendor;
}
const wxString & PluginDescriptor::GetDescription() const
{
return mDescription;
}
const PluginID & PluginDescriptor::GetID() const
{
return mID;
@ -859,6 +834,41 @@ const PluginID & PluginDescriptor::GetProviderID() const
return mProviderID;
}
const wxString & PluginDescriptor::GetPath() const
{
return mPath;
}
const wxString & PluginDescriptor::GetSymbol() const
{
if (mSymbol.IsEmpty())
{
return mName;
}
return mSymbol;
}
wxString PluginDescriptor::GetName() const
{
return wxGetTranslation(mName);
}
wxString PluginDescriptor::GetVersion() const
{
return wxGetTranslation(mVersion);
}
wxString PluginDescriptor::GetVendor() const
{
return wxGetTranslation(mVendor);
}
wxString PluginDescriptor::GetDescription() const
{
return wxGetTranslation(mDescription);
}
bool PluginDescriptor::IsEnabled() const
{
return mEnabled;
@ -869,27 +879,31 @@ bool PluginDescriptor::IsValid() const
return mValid;
}
wxString PluginDescriptor::GetMenuName() const
{
// This probably shouldn't be here...but it was easy
wxString name;
mName.EndsWith(wxT("..."), &name);
return (mVendor.IsEmpty() ? wxT("") : mVendor + wxT(": ")) +
(name.IsEmpty() ? mName : name) +
(mEffectInteractive ? wxT("...") : wxT(""));
}
void PluginDescriptor::SetPluginType(PluginType type)
{
mPluginType = type;
}
void PluginDescriptor::SetID(const PluginID & ID)
{
mID = ID;
}
void PluginDescriptor::SetProviderID(const PluginID & providerID)
{
mProviderID = providerID;
}
void PluginDescriptor::SetPath(const wxString & path)
{
mPath = path;
}
void PluginDescriptor::SetSymbol(const wxString & symbol)
{
mSymbol = symbol;
}
void PluginDescriptor::SetName(const wxString & name)
{
mName = name;
@ -910,16 +924,6 @@ void PluginDescriptor::SetDescription(const wxString & description)
mDescription = description;
}
void PluginDescriptor::SetID(const PluginID & ID)
{
mID = ID;
}
void PluginDescriptor::SetProviderID(const PluginID & providerID)
{
mProviderID = providerID;
}
void PluginDescriptor::SetEnabled(bool enable)
{
mEnabled = enable;
@ -1040,11 +1044,14 @@ void PluginDescriptor::SetImporterExtensions(const wxArrayString & extensions)
//
///////////////////////////////////////////////////////////////////////////////
#define REGVERKEY wxString(wxT("/pluginregistryversion"))
#define REGVERCUR wxString(wxT("1.1"))
#define CACHEROOT wxString(wxT("/plugincache/"))
#define KEY_ID wxT("ID")
#define KEY_NAME wxT("Name")
#define KEY_PATH wxT("Path")
#define KEY_SYMBOL wxT("Symbol")
#define KEY_NAME wxT("Name")
#define KEY_VENDOR wxT("Vendor")
#define KEY_VERSION wxT("Version")
#define KEY_DESCRIPTION wxT("Description")
@ -1420,6 +1427,14 @@ bool PluginManager::Load()
return false;
}
// Check for a registry version that we can understand
wxString regver = mConfig->Read(REGVERKEY);
if (regver > REGVERCUR )
{
// This is where we'd put in conversion code when the
// registry version changed.
}
// Load all provider plugins first
LoadGroup(wxT("modules"), PluginTypeModule);
@ -1469,7 +1484,7 @@ void PluginManager::LoadGroup(const wxChar * group, PluginType type)
if (!mConfig->Read(KEY_PROVIDERID, &strVal, wxEmptyString))
{
// Bypass group if the provider isn't valid
if (!strVal.IsEmpty() && mPlugins.find(wxString(strVal)) == mPlugins.end())
if (!strVal.IsEmpty() && mPlugins.find(strVal) == mPlugins.end())
{
continue;
}
@ -1478,35 +1493,42 @@ void PluginManager::LoadGroup(const wxChar * group, PluginType type)
// Get the path (optional)
mConfig->Read(KEY_PATH, &strVal, wxEmptyString);
plug.SetPath(wxString(strVal));
plug.SetPath(strVal);
// Get the name and bypass group if not found
if (!mConfig->Read(KEY_NAME, &strVal))
{
continue;
}
plug.SetName(wxString(strVal));
plug.SetName(strVal);
// Get the symbol...use name if not found
if (!mConfig->Read(KEY_SYMBOL, &strVal))
{
strVal = plug.GetName();
}
plug.SetSymbol(strVal);
// Get the version and bypass group if not found
if (!mConfig->Read(KEY_VERSION, &strVal))
{
continue;
}
plug.SetVersion(wxString(strVal));
plug.SetVersion(strVal);
// Get the vendor and bypass group if not found
if (!mConfig->Read(KEY_VENDOR, &strVal))
{
continue;
}
plug.SetVendor(wxString(strVal));
plug.SetVendor(strVal);
// Get the description and bypass group if not found
if (!mConfig->Read(KEY_DESCRIPTION, &strVal))
{
continue;
}
plug.SetDescription(wxString(strVal));
plug.SetDescription(strVal);
// Is it enabled...default to no if not found
mConfig->Read(KEY_ENABLED, &boolVal, false);
@ -1558,7 +1580,7 @@ void PluginManager::LoadGroup(const wxChar * group, PluginType type)
{
continue;
}
plug.SetEffectFamily(wxString(strVal));
plug.SetEffectFamily(strVal);
// Is it a default (above the line) effect and bypass group if not found
if (!mConfig->Read(KEY_EFFECTDEFAULT, &boolVal))
@ -1597,14 +1619,14 @@ void PluginManager::LoadGroup(const wxChar * group, PluginType type)
{
continue;
}
plug.SetImporterIdentifier(wxString(strVal));
plug.SetImporterIdentifier(strVal);
// Get the importer filter description and bypass group if not found
if (!mConfig->Read(KEY_IMPORTERFILTER, &strVal))
{
continue;
}
plug.SetImporterFilterDescription(wxString(strVal));
plug.SetImporterFilterDescription(strVal);
// Get the importer extensions and bypass group if not found
if (!mConfig->Read(KEY_IMPORTEREXTENSIONS, &strVal))
@ -1615,7 +1637,7 @@ void PluginManager::LoadGroup(const wxChar * group, PluginType type)
wxStringTokenizer tkr(strVal, wxT(":"));
while (tkr.HasMoreTokens())
{
extensions.push_back(wxString(tkr.GetNextToken()));
extensions.Add(tkr.GetNextToken());
}
plug.SetImporterExtensions(extensions);
}
@ -1676,6 +1698,7 @@ void PluginManager::SaveGroup(const wxChar *group, PluginType type)
mConfig->SetPath(CACHEROOT + group + wxCONFIG_PATH_SEPARATOR + ConvertID(plug.GetID()));
mConfig->Write(KEY_PATH, plug.GetPath());
mConfig->Write(KEY_SYMBOL, plug.GetSymbol());
mConfig->Write(KEY_NAME, plug.GetName());
mConfig->Write(KEY_VERSION, plug.GetVersion());
mConfig->Write(KEY_VENDOR, plug.GetVendor());
@ -1741,7 +1764,7 @@ void PluginManager::SaveGroup(const wxChar *group, PluginType type)
return;
}
void PluginManager::CheckForUpdates(bool forceRescan)
void PluginManager::CheckForUpdates(bool WXUNUSED(forceRescan))
{
// Get ModuleManager reference
ModuleManager & mm = ModuleManager::Get();
@ -1974,7 +1997,7 @@ void PluginManager::EnablePlugin(const PluginID & ID, bool enable)
return mPlugins[ID].SetEnabled(enable);
}
const wxString & PluginManager::GetName(const PluginID & ID)
const wxString & PluginManager::GetSymbol(const PluginID & ID)
{
if (mPlugins.find(ID) == mPlugins.end())
{
@ -1982,6 +2005,16 @@ const wxString & PluginManager::GetName(const PluginID & ID)
return empty;
}
return mPlugins[ID].GetSymbol();
}
wxString PluginManager::GetName(const PluginID & ID)
{
if (mPlugins.find(ID) == mPlugins.end())
{
return wxEmptyString;
}
return mPlugins[ID].GetName();
}

35
src/PluginManager.h
View File

@ -54,40 +54,49 @@ public:
// All plugins
// These return untranslated strings
const wxString & GetID() const;
const wxString & GetPath() const;
const wxString & GetName() const;
const wxString & GetVersion() const;
const wxString & GetVendor() const;
const wxString & GetDescription() const;
const wxString & GetProviderID() const;
const wxString & GetPath() const;
const wxString & GetSymbol() const;
// These return translated strings (if available)
wxString GetName() const;
wxString GetVersion() const;
wxString GetVendor() const;
wxString GetDescription() const;
bool IsEnabled() const;
bool IsValid() const;
// These should be passed an untranslated value
void SetID(const PluginID & ID);
void SetProviderID(const PluginID & providerID);
void SetPath(const wxString & path);
void SetSymbol(const wxString & symbol);
// These should be passed an untranslated value wrapped in wxTRANSLATE() so
// the value will still be extracted for translation
void SetName(const wxString & name);
void SetVersion(const wxString & version);
void SetVendor(const wxString & vendor);
void SetDescription(const wxString & description);
void SetProviderID(const PluginID & providerID);
void SetEnabled(bool enable);
void SetValid(bool valid);
wxString GetMenuName() const;
// Effect plugins only
EffectType GetEffectType() const;
// Will return an untranslated string
const wxString & GetEffectFamily() const;
EffectType GetEffectType() const;
bool IsEffectDefault() const;
bool IsEffectInteractive() const;
bool IsEffectLegacy() const;
bool IsEffectRealtime() const;
bool IsEffectAutomatable() const;
void SetEffectType(EffectType type);
// "family" should be an untranslated string wrapped in wxT()
void SetEffectFamily(const wxString & family);
void SetEffectType(EffectType type);
void SetEffectDefault(bool dflt);
void SetEffectInteractive(bool interactive);
void SetEffectLegacy(bool legacy);
@ -114,6 +123,7 @@ private:
wxString mID;
wxString mPath;
wxString mSymbol;
wxString mName;
wxString mVersion;
wxString mVendor;
@ -234,7 +244,10 @@ public:
bool IsPluginEnabled(const PluginID & ID);
void EnablePlugin(const PluginID & ID, bool enable);
const wxString & GetName(const PluginID & ID);
// Returns untranslated string
const wxString & GetSymbol(const PluginID & ID);
// Returns translated string
wxString GetName(const PluginID & ID);
IdentInterface *GetInstance(const PluginID & ID);
void SetInstance(const PluginID & ID, IdentInterface *instance); // TODO: Remove after conversion

4
src/commands/CommandManager.cpp
View File

@ -1123,8 +1123,8 @@ bool CommandManager::HandleTextualCommand(wxString & Str, wxUint32 flags, wxUint
EffectManager & em = EffectManager::Get();
const PluginDescriptor *plug = pm.GetFirstPlugin(PluginTypeEffect);
while (plug)
{
if (em.GetEffectName(plug->GetID()).IsSameAs(Str))
{
if (em.GetEffectByIdentifier(plug->GetID()).IsSameAs(Str))
{
return proj->OnEffect( ALL_EFFECTS | CONFIGURED_EFFECT, plug->GetID());
}

2
src/effects/Amplify.h
View File

@ -34,7 +34,7 @@ class EffectAmplify:public EffectSimpleMono
EffectAmplify();
virtual wxString GetEffectName() {
return wxString(_("Amplify..."));
return wxString(wxTRANSLATE("Amplify..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/AutoDuck.h
View File

@ -99,7 +99,7 @@ public:
virtual wxString GetEffectName()
{
return wxString(_("Auto Duck..."));
return wxString(wxTRANSLATE("Auto Duck..."));
}
virtual std::set<wxString> GetEffectCategories()

2
src/effects/BassTreble.h
View File

@ -25,7 +25,7 @@ public:
virtual ~EffectBassTreble() {};
virtual wxString GetEffectName() {
return wxString(_("Bass and Treble..."));
return wxString(wxTRANSLATE("Bass and Treble..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/ChangePitch.h
View File

@ -32,7 +32,7 @@ class EffectChangePitch : public EffectSoundTouch
public:
EffectChangePitch();
virtual wxString GetEffectName() { return wxString(_("Change Pitch...")); }
virtual wxString GetEffectName() { return wxString(wxTRANSLATE("Change Pitch...")); }
virtual std::set<wxString> GetEffectCategories() {
std::set<wxString> result;

2
src/effects/ChangeSpeed.h
View File

@ -30,7 +30,7 @@ class EffectChangeSpeed : public Effect
EffectChangeSpeed();
virtual wxString GetEffectName() {
return wxString(_("Change Speed..."));
return wxString(wxTRANSLATE("Change Speed..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/ChangeTempo.h
View File

@ -32,7 +32,7 @@ class EffectChangeTempo : public EffectSoundTouch {
EffectChangeTempo();
virtual wxString GetEffectName() {
return wxString(_("Change Tempo..."));
return wxString(wxTRANSLATE("Change Tempo..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/ClickRemoval.h
View File

@ -39,7 +39,7 @@ public:
virtual ~EffectClickRemoval();
virtual wxString GetEffectName() {
return wxString(_("Click Removal..."));
return wxString(wxTRANSLATE("Click Removal..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Compressor.h
View File

@ -36,7 +36,7 @@ public:
virtual ~EffectCompressor();
virtual wxString GetEffectName() {
return wxString(_("Compressor..."));
return wxString(wxTRANSLATE("Compressor..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/DtmfGen.h
View File

@ -38,7 +38,7 @@ class EffectDtmf : public Generator {
}
virtual wxString GetEffectName() {
return wxString(_("DTMF Tones..."));
return wxString(wxTRANSLATE("DTMF Tones..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Echo.h
View File

@ -31,7 +31,7 @@ class EffectEcho:public Effect {
EffectEcho();
virtual wxString GetEffectName() {
return wxString(_("Echo..."));
return wxString(wxTRANSLATE("Echo..."));
}
virtual std::set<wxString> GetEffectCategories() {

16
src/effects/Effect.cpp
View File

@ -173,6 +173,16 @@ wxString Effect::GetPath()
return wxEmptyString;
}
wxString Effect::GetSymbol()
{
if (mClient)
{
return mClient->GetSymbol();
}
return GetEffectIdentifier();
}
wxString Effect::GetName()
{
if (mClient)
@ -180,7 +190,7 @@ wxString Effect::GetName()
return mClient->GetName();
}
return GetEffectIdentifier();
return GetEffectName();
}
wxString Effect::GetVendor()
@ -2344,7 +2354,7 @@ void EffectUIHost::OnCancel(wxCommandEvent & WXUNUSED(evt))
return;
}
void EffectUIHost::OnMenu(wxCommandEvent & evt)
void EffectUIHost::OnMenu(wxCommandEvent & WXUNUSED(evt))
{
wxMenu *menu = new wxMenu();
wxMenu *sub;
@ -2695,7 +2705,7 @@ void EffectUIHost::SetLabelAndTip(wxBitmapButton *btn, const wxString & label, b
{
if (btn != NULL)
{
int pos = label.Find(wxT('&'));
size_t pos = label.Find(wxT('&'));
if (pos != wxNOT_FOUND && pos < label.Length() - 1)
{
wxChar c = wxToupper(label[pos + 1]);

1
src/effects/Effect.h
View File

@ -83,6 +83,7 @@ class AUDACITY_DLL_API Effect : public EffectHostInterface
virtual PluginID GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

2
src/effects/EffectManager.cpp
View File

@ -309,7 +309,7 @@ wxString EffectManager::GetEffectName(const PluginID & ID)
wxString EffectManager::GetEffectIdentifier(const PluginID & ID)
{
wxString name = (PluginManager::Get().GetName(ID));
wxString name = (PluginManager::Get().GetSymbol(ID));
// Get rid of leading and trailing white space
name.Trim(true).Trim(false);

2
src/effects/Equalization.h
View File

@ -86,7 +86,7 @@ public:
virtual ~EffectEqualization();
virtual wxString GetEffectName() {
return wxString(_("Equalization..."));
return wxString(wxTRANSLATE("Equalization..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Fade.h
View File

@ -21,7 +21,7 @@ class EffectFadeIn: public EffectSimpleMono {
public:
virtual wxString GetEffectName() {
return wxString(_("Fade In"));
return wxString(wxTRANSLATE("Fade In"));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/FindClipping.h
View File

@ -34,7 +34,7 @@ class EffectFindClipping:public Effect
virtual wxString GetEffectName()
{
return wxString(_("Find Clipping..."));
return wxString(wxTRANSLATE("Find Clipping..."));
}
virtual std::set<wxString> GetEffectCategories()

2
src/effects/Invert.h
View File

@ -24,7 +24,7 @@ class EffectInvert:public EffectSimpleMono {
public:
virtual wxString GetEffectName() {
return wxString(_("Invert"));
return wxString(wxTRANSLATE("Invert"));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Leveller.h
View File

@ -25,7 +25,7 @@ class EffectLeveller: public EffectSimpleMono
EffectLeveller();
virtual wxString GetEffectName() {
return wxString(_("Leveler..."));
return wxString(wxTRANSLATE("Leveler..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Noise.h
View File

@ -41,7 +41,7 @@ class EffectNoise : public BlockGenerator {
virtual bool Init();
virtual wxString GetEffectName() {
return wxString(_("Noise..."));
return wxString(wxTRANSLATE("Noise..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/NoiseReduction.cpp
View File

@ -427,7 +427,7 @@ bool EffectNoiseReduction::CheckWhetherSkipEffect()
wxString EffectNoiseReduction::GetEffectName()
{
return wxString(_("Noise Reduction..."));
return wxString(wxTRANSLATE("Noise Reduction..."));
}
std::set<wxString> EffectNoiseReduction::GetEffectCategories()

2
src/effects/NoiseRemoval.h
View File

@ -34,7 +34,7 @@ public:
virtual ~EffectNoiseRemoval();
virtual wxString GetEffectName() {
return wxString(_("Noise Removal..."));
return wxString(wxTRANSLATE("Noise Removal..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Normalize.h
View File

@ -30,7 +30,7 @@ class EffectNormalize: public Effect
EffectNormalize();
virtual wxString GetEffectName() {
return wxString(_("Normalize..."));
return wxString(wxTRANSLATE("Normalize..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Paulstretch.h
View File

@ -27,7 +27,7 @@ class EffectPaulstretch:public Effect{
* wouldn't normally get translated. It's the combination of the author's
* name (Paul) with what it does (stretch sound)
*/
return wxString(_("Paulstretch..."));
return wxString(wxTRANSLATE("Paulstretch..."));
}
virtual wxString GetEffectAction() {

2
src/effects/Phaser.h
View File

@ -42,7 +42,7 @@ class EffectPhaser:public EffectSimpleMono {
EffectPhaser();
virtual wxString GetEffectName() {
return wxString(_("Phaser..."));
return wxString(wxTRANSLATE("Phaser..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Repair.h
View File

@ -26,7 +26,7 @@ public:
virtual ~EffectRepair();
virtual wxString GetEffectName() {
return wxString(_("Repair"));
return wxString(wxTRANSLATE("Repair"));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Repeat.h
View File

@ -30,7 +30,7 @@ class EffectRepeat:public Effect
EffectRepeat();
virtual wxString GetEffectName() {
return wxString(_("Repeat..."));
return wxString(wxTRANSLATE("Repeat..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Reverb.h
View File

@ -31,7 +31,7 @@ public:
virtual ~EffectReverb() {};
// Implemented from the base class 'Effect':
virtual wxString GetEffectName() {return _("Reverb...");}
virtual wxString GetEffectName() {return wxTRANSLATE("Reverb...");}
virtual wxString GetEffectAction() {return _("Applying Reverb");}
virtual wxString GetEffectIdentifier() {return wxT("Reverb");}
virtual wxString GetEffectDescription(); // Useful only after PromptUser values have been set.

2
src/effects/Reverse.h
View File

@ -27,7 +27,7 @@ class EffectReverse:public Effect {
EffectReverse();
virtual wxString GetEffectName() {
return wxString(_("Reverse"));
return wxString(wxTRANSLATE("Reverse"));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/ScienFilter.h
View File

@ -48,7 +48,7 @@ public:
virtual ~EffectScienFilter();
virtual wxString GetEffectName() {
return wxString(_("Classic Filters..."));
return wxString(wxTRANSLATE("Classic Filters..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/Silence.h
View File

@ -30,7 +30,7 @@ class EffectSilence : public Generator {
}
virtual wxString GetEffectName() {
return wxString(_("Silence..."));
return wxString(wxTRANSLATE("Silence..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/StereoToMono.h
View File

@ -20,7 +20,7 @@ public:
EffectStereoToMono();
virtual wxString GetEffectName() {
return wxString(_("Stereo to Mono"));
return wxString(wxTRANSLATE("Stereo to Mono"));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/TimeScale.h
View File

@ -30,7 +30,7 @@ class EffectTimeScale : public EffectSBSMS {
EffectTimeScale();
virtual wxString GetEffectName() {
return wxString(_("Sliding Time Scale/Pitch Shift..."));
return wxString(wxTRANSLATE("Sliding Time Scale/Pitch Shift..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/ToneGen.h
View File

@ -37,7 +37,7 @@ class EffectToneGen : public BlockGenerator {
EffectToneGen & EnableForChirps(){mbChirp=true;return *this;};
virtual wxString GetEffectName() {
return wxString(mbChirp? _("Chirp..."):_("Tone..."));
return wxString(mbChirp? wxTRANSLATE("Chirp..."):wxTRANSLATE("Tone..."));
}
virtual std::set<wxString> GetEffectCategories() {

2
src/effects/TruncSilence.h
View File

@ -34,7 +34,7 @@ public:
EffectTruncSilence();
virtual wxString GetEffectName() {
return wxString(_("Truncate Silence..."));
return wxString(wxTRANSLATE("Truncate Silence..."));
}
virtual std::set<wxString> GetEffectCategories() {

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

@ -198,11 +198,16 @@ public:
return mPath;
}
wxString GetName()
wxString GetSymbol()
{
return mName;
}
wxString GetName()
{
return GetSymbol();
}
wxString GetVendor()
{
return mVendor;
@ -300,6 +305,11 @@ wxString VSTEffectsModule::GetPath()
return mPath;
}
wxString VSTEffectsModule::GetSymbol()
{
return wxT("VST Effects");
}
wxString VSTEffectsModule::GetName()
{
return _("VST Effects");
@ -551,7 +561,7 @@ bool VSTEffectsModule::RegisterPlugin(PluginManagerInterface & pm, const wxStrin
return valid;
}
bool VSTEffectsModule::IsPluginValid(const PluginID & ID,
bool VSTEffectsModule::IsPluginValid(const PluginID & WXUNUSED(ID),
const wxString & path)
{
return wxFileName::FileExists(path) || wxFileName::DirExists(path);
@ -1549,11 +1559,16 @@ wxString VSTEffect::GetPath()
return mPath;
}
wxString VSTEffect::GetName()
wxString VSTEffect::GetSymbol()
{
return mName;
}
wxString VSTEffect::GetName()
{
return GetSymbol();
}
wxString VSTEffect::GetVendor()
{
return mVendor;
@ -2050,7 +2065,7 @@ bool VSTEffect::ShowInterface(wxWindow *parent, bool forceModal)
return false;
}
bool res = mDialog->ShowModal();
bool res = mDialog->ShowModal() != 0;
mDialog = NULL;
return res;

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

@ -76,6 +76,7 @@ class VSTEffect : public EffectClientInterface,
virtual PluginID GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();
@ -399,6 +400,7 @@ public:
virtual wxString GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

2
src/effects/Wahwah.h
View File

@ -38,7 +38,7 @@ class EffectWahwah:public EffectSimpleMono {
EffectWahwah();
virtual wxString GetEffectName() {
return wxString(_("Wahwah..."));
return wxString(wxTRANSLATE("Wahwah..."));
}
virtual std::set<wxString> GetEffectCategories() {

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

@ -90,9 +90,14 @@ wxString AudioUnitEffectsModule::GetPath()
return mPath;
}
wxString AudioUnitEffectsModule::GetSymbol()
{
return wxT("Audio Unit Effects");
}
wxString AudioUnitEffectsModule::GetName()
{
return _("Audio Unit Effects Module");
return _("Audio Unit Effects");
}
wxString AudioUnitEffectsModule::GetVendor()
@ -976,11 +981,16 @@ wxString AudioUnitEffect::GetPath()
return mPath;
}
wxString AudioUnitEffect::GetName()
wxString AudioUnitEffect::GetSymbol()
{
return mName;
}
wxString AudioUnitEffect::GetName()
{
return GetSymbol();
}
wxString AudioUnitEffect::GetVendor()
{
return mVendor;

2
src/effects/audiounits/AudioUnitEffect.h
View File

@ -50,6 +50,7 @@ public:
virtual PluginID GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();
@ -259,6 +260,7 @@ public:
virtual wxString GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

22
src/effects/ladspa/LadspaEffect.cpp
View File

@ -106,14 +106,19 @@ wxString LadspaEffectsModule::GetPath()
return mPath;
}
wxString LadspaEffectsModule::GetSymbol()
{
return wxT("Ladspa Effects");
}
wxString LadspaEffectsModule::GetName()
{
return _("Ladspa Effect Module");
return wxTRANSLATE("Ladspa Effects");
}
wxString LadspaEffectsModule::GetVendor()
{
return _("The Audacity Team");
return wxTRANSLATE("The Audacity Team");
}
wxString LadspaEffectsModule::GetVersion()
@ -124,7 +129,7 @@ wxString LadspaEffectsModule::GetVersion()
wxString LadspaEffectsModule::GetDescription()
{
return _("Provides Ladspa Effects");
return wxTRANSLATE("Provides Ladspa Effects");
}
// ============================================================================
@ -347,7 +352,7 @@ bool LadspaEffectsModule::RegisterPlugin(PluginManagerInterface & pm, const wxSt
return index > 0;
}
bool LadspaEffectsModule::IsPluginValid(const PluginID & ID,
bool LadspaEffectsModule::IsPluginValid(const PluginID & WXUNUSED(ID),
const wxString & path)
{
return wxFileName::FileExists(path);
@ -612,11 +617,16 @@ wxString LadspaEffect::GetPath()
return mPath;
}
wxString LadspaEffect::GetName()
wxString LadspaEffect::GetSymbol()
{
return LAT1CTOWX(mData->Name);
}
wxString LadspaEffect::GetName()
{
return GetSymbol();
}
wxString LadspaEffect::GetVendor()
{
return LAT1CTOWX(mData->Maker);
@ -1004,7 +1014,7 @@ sampleCount LadspaEffect::RealtimeProcess(int group,
return numSamples;
}
bool LadspaEffect::RealtimeAddProcessor(int numChannels, float sampleRate)
bool LadspaEffect::RealtimeAddProcessor(int WXUNUSED(numChannels), float sampleRate)
{
LADSPA_Handle slave = InitInstance(sampleRate);
if (!slave)

2
src/effects/ladspa/LadspaEffect.h
View File

@ -47,6 +47,7 @@ public:
virtual PluginID GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();
@ -232,6 +233,7 @@ public:
virtual wxString GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

7
src/effects/lv2/LV2Effect.cpp
View File

@ -312,11 +312,16 @@ wxString LV2Effect::GetPath()
return GetString(lilv_plugin_get_bundle_uri(mData));
}
wxString LV2Effect::GetName()
wxString LV2Effect::GetSymbol()
{
return pluginName;
}
wxString LV2Effect::GetName()
{
return GetSymbol();
}
wxString LV2Effect::GetVendor()
{
wxString vendor = GetString(lilv_plugin_get_author_name(mData), true);

1
src/effects/lv2/LV2Effect.h
View File

@ -72,6 +72,7 @@ public:
virtual PluginID GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

25
src/effects/lv2/LoadLV2.cpp
View File

@ -151,14 +151,19 @@ wxString LV2EffectsModule::GetPath()
return mPath;
}
wxString LV2EffectsModule::GetSymbol()
{
return wxT("LV2 Effects");
}
wxString LV2EffectsModule::GetName()
{
return _("LV2 Effects Module");
return wxTRANSLATE("LV2 Effects");
}
wxString LV2EffectsModule::GetVendor()
{
return _("The Audacity Team");
return wxTRANSLATE("The Audacity Team");
}
wxString LV2EffectsModule::GetVersion()
@ -169,7 +174,7 @@ wxString LV2EffectsModule::GetVersion()
wxString LV2EffectsModule::GetDescription()
{
return _("Provides LV2 Effects support to Audacity");
return wxTRANSLATE("Provides LV2 Effects support to Audacity");
}
// ============================================================================
@ -255,7 +260,7 @@ void LV2EffectsModule::Terminate()
return;
}
bool LV2EffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
bool LV2EffectsModule::AutoRegisterPlugins(PluginManagerInterface & WXUNUSED(pm))
{
EffectManager& em = EffectManager::Get();
@ -305,20 +310,20 @@ bool LV2EffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
return true;
}
wxArrayString LV2EffectsModule::FindPlugins(PluginManagerInterface & pm)
wxArrayString LV2EffectsModule::FindPlugins(PluginManagerInterface & WXUNUSED(pm))
{
// Nothing to do here yet
return wxArrayString();
}
bool LV2EffectsModule::RegisterPlugin(PluginManagerInterface & pm, const wxString & path)
bool LV2EffectsModule::RegisterPlugin(PluginManagerInterface & WXUNUSED(pm), const wxString & WXUNUSED(path))
{
// Nothing to do here yet
return false;
}
bool LV2EffectsModule::IsPluginValid(const PluginID & ID,
const wxString & path)
const wxString & WXUNUSED(path))
{
LilvNode *uri = lilv_new_uri(gWorld, ID.ToUTF8());
const LilvPlugin *plugin = lilv_plugins_get_by_uri(lilv_world_get_all_plugins(gWorld), uri);
@ -327,15 +332,15 @@ bool LV2EffectsModule::IsPluginValid(const PluginID & ID,
return plugin != NULL;
}
IdentInterface *LV2EffectsModule::CreateInstance(const PluginID & ID,
const wxString & path)
IdentInterface *LV2EffectsModule::CreateInstance(const PluginID & WXUNUSED(ID),
const wxString & WXUNUSED(path))
{
// Nothing to do here yet since we are autoregistering (and creating legacy
// effects anyway).
return NULL;
}
void LV2EffectsModule::DeleteInstance(IdentInterface *instance)
void LV2EffectsModule::DeleteInstance(IdentInterface *WXUNUSED(instance))
{
// Nothing to do here yet
}

1
src/effects/lv2/LoadLV2.h
View File

@ -31,6 +31,7 @@ public:
virtual wxString GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

21
src/effects/nyquist/LoadNyquist.cpp
View File

@ -68,14 +68,19 @@ wxString NyquistEffectsModule::GetPath()
return mPath;
}
wxString NyquistEffectsModule::GetSymbol()
{
return wxT("Nyquist Effects");
}
wxString NyquistEffectsModule::GetName()
{
return _("Nyquist Effects Module");
return wxTRANSLATE("Nyquist Effects");
}
wxString NyquistEffectsModule::GetVendor()
{
return _("The Audacity Team");
return wxTRANSLATE("The Audacity Team");
}
wxString NyquistEffectsModule::GetVersion()
@ -86,7 +91,7 @@ wxString NyquistEffectsModule::GetVersion()
wxString NyquistEffectsModule::GetDescription()
{
return _("Provides Nyquist Effects support to Audacity");
return wxTRANSLATE("Provides Nyquist Effects support to Audacity");
}
// ============================================================================
@ -139,13 +144,13 @@ bool NyquistEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
return true;
}
wxArrayString NyquistEffectsModule::FindPlugins(PluginManagerInterface & pm)
wxArrayString NyquistEffectsModule::FindPlugins(PluginManagerInterface & WXUNUSED(pm))
{
// Nothing to do here yet
return wxArrayString();
}
bool NyquistEffectsModule::RegisterPlugin(PluginManagerInterface & pm, const wxString & path)
bool NyquistEffectsModule::RegisterPlugin(PluginManagerInterface & WXUNUSED(pm), const wxString & WXUNUSED(path))
{
// Nothing to do here yet
return false;
@ -162,15 +167,15 @@ bool NyquistEffectsModule::IsPluginValid(const PluginID & ID,
return wxFileName::FileExists(path);
}
IdentInterface *NyquistEffectsModule::CreateInstance(const PluginID & ID,
const wxString & path)
IdentInterface *NyquistEffectsModule::CreateInstance(const PluginID & WXUNUSED(ID),
const wxString & WXUNUSED(path))
{
// Nothing to do here yet since we are autoregistering (and creating legacy
// effects anyway).
return NULL;
}
void NyquistEffectsModule::DeleteInstance(IdentInterface *instance)
void NyquistEffectsModule::DeleteInstance(IdentInterface *WXUNUSED(instance))
{
// Nothing to do here yet
}

1
src/effects/nyquist/LoadNyquist.h
View File

@ -28,6 +28,7 @@ public:
virtual wxString GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

9
src/effects/nyquist/Nyquist.cpp
View File

@ -153,16 +153,21 @@ wxString EffectNyquist::GetPath()
return mFileName.GetFullPath();
}
wxString EffectNyquist::GetName()
wxString EffectNyquist::GetSymbol()
{
return mName;
}
wxString EffectNyquist::GetName()
{
return GetSymbol();
}
wxString EffectNyquist::GetVendor()
{
if (GetID() == wxT("nyquist prompt"))
{
return wxT("Audacity");
return _("Audacity");
}
return mAuthor;

1
src/effects/nyquist/Nyquist.h
View File

@ -67,6 +67,7 @@ class AUDACITY_DLL_API EffectNyquist:public Effect
virtual PluginID GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

25
src/effects/vamp/LoadVamp.cpp
View File

@ -76,14 +76,19 @@ wxString VampEffectsModule::GetPath()
return mPath;
}
wxString VampEffectsModule::GetSymbol()
{
return wxT("Vamp Effects");
}
wxString VampEffectsModule::GetName()
{
return _("Vamp Effects Module");
return wxTRANSLATE("Vamp Effects");
}
wxString VampEffectsModule::GetVendor()
{
return _("The Audacity Team");
return wxTRANSLATE("The Audacity Team");
}
wxString VampEffectsModule::GetVersion()
@ -94,7 +99,7 @@ wxString VampEffectsModule::GetVersion()
wxString VampEffectsModule::GetDescription()
{
return _("Provides Vamp Effects support to Audacity");
return wxTRANSLATE("Provides Vamp Effects support to Audacity");
}
// ============================================================================
@ -113,7 +118,7 @@ void VampEffectsModule::Terminate()
return;
}
bool VampEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
bool VampEffectsModule::AutoRegisterPlugins(PluginManagerInterface & WXUNUSED(pm))
{
#ifdef EFFECT_CATEGORIES
InitCategoryMap();
@ -208,33 +213,33 @@ bool VampEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
return true;
}
wxArrayString VampEffectsModule::FindPlugins(PluginManagerInterface & pm)
wxArrayString VampEffectsModule::FindPlugins(PluginManagerInterface & WXUNUSED(pm))
{
// Nothing to do here yet
return wxArrayString();
}
bool VampEffectsModule::RegisterPlugin(PluginManagerInterface & pm, const wxString & path)
bool VampEffectsModule::RegisterPlugin(PluginManagerInterface & WXUNUSED(pm), const wxString & WXUNUSED(path))
{
// Nothing to do here yet
return false;
}
bool VampEffectsModule::IsPluginValid(const PluginID & ID,
bool VampEffectsModule::IsPluginValid(const PluginID & WXUNUSED(ID),
const wxString & path)
{
return wxFileName::FileExists(path);
}
IdentInterface *VampEffectsModule::CreateInstance(const PluginID & ID,
const wxString & path)
IdentInterface *VampEffectsModule::CreateInstance(const PluginID & WXUNUSED(ID),
const wxString & WXUNUSED(path))
{
// Nothing to do here yet since we are autoregistering (and creating legacy
// effects anyway).
return NULL;
}
void VampEffectsModule::DeleteInstance(IdentInterface *instance)
void VampEffectsModule::DeleteInstance(IdentInterface *WXUNUSED(instance))
{
// Nothing to do here yet
}

1
src/effects/vamp/LoadVamp.h
View File

@ -28,6 +28,7 @@ public:
virtual wxString GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();

7
src/effects/vamp/VampEffect.cpp
View File

@ -79,11 +79,16 @@ wxString VampEffect::GetPath()
return LAT1CTOWX(loader->getLibraryPathForPlugin(mKey).c_str());
}
wxString VampEffect::GetName()
wxString VampEffect::GetSymbol()
{
return mName;
}
wxString VampEffect::GetName()
{
return GetSymbol();
}
wxString VampEffect::GetVendor()
{
return LAT1CTOWX(mPlugin->getMaker().c_str());

1
src/effects/vamp/VampEffect.h
View File

@ -42,6 +42,7 @@ class VampEffect : public Effect {
virtual PluginID GetID();
virtual wxString GetPath();
virtual wxString GetSymbol();
virtual wxString GetName();
virtual wxString GetVendor();
virtual wxString GetVersion();