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

Rename Settings to Options in RTP dialogs

Browse Source 
This was suggested here:

http://audacity.238276.n2.nabble.com/Effect-options-dialogs-should-be-titled-Options-not-Settings-tt7566034.html

(Probably should delete your pluginregister.cfg file, but not a requirement.)
This commit is contained in:
lllucius@gmail.com 2014-12-15 04:49:06 +00:00
parent 83ba6da21a
commit 3da4e22cee
3 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -608,15 +608,15 @@ void VSTEffectsModule::Check(const wxChar *path)
///////////////////////////////////////////////////////////////////////////////
//
// VSTEffectSettingsDialog
// VSTEffectOptionsDialog
//
///////////////////////////////////////////////////////////////////////////////
class VSTEffectSettingsDialog:public wxDialog
class VSTEffectOptionsDialog:public wxDialog
{
public:
VSTEffectSettingsDialog(wxWindow * parent, EffectHostInterface *host);
virtual ~VSTEffectSettingsDialog();
VSTEffectOptionsDialog(wxWindow * parent, EffectHostInterface *host);
virtual ~VSTEffectOptionsDialog();
void PopulateOrExchange(ShuttleGui & S);
@ -631,28 +631,28 @@ private:
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(VSTEffectSettingsDialog, wxDialog)
EVT_BUTTON(wxID_OK, VSTEffectSettingsDialog::OnOk)
BEGIN_EVENT_TABLE(VSTEffectOptionsDialog, wxDialog)
EVT_BUTTON(wxID_OK, VSTEffectOptionsDialog::OnOk)
END_EVENT_TABLE()
VSTEffectSettingsDialog::VSTEffectSettingsDialog(wxWindow * parent, EffectHostInterface *host)
: wxDialog(parent, wxID_ANY, wxString(_("VST Effect Settings")))
VSTEffectOptionsDialog::VSTEffectOptionsDialog(wxWindow * parent, EffectHostInterface *host)
: wxDialog(parent, wxID_ANY, wxString(_("VST Effect Options")))
{
mHost = host;
mHost->GetSharedConfig(wxT("Settings"), wxT("BufferSize"), mBufferSize, 8192);
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Settings"), wxT("UseGUI"), mUseGUI, true);
mHost->GetSharedConfig(wxT("Options"), wxT("BufferSize"), mBufferSize, 8192);
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
}
VSTEffectSettingsDialog::~VSTEffectSettingsDialog()
VSTEffectOptionsDialog::~VSTEffectOptionsDialog()
{
}
void VSTEffectSettingsDialog::PopulateOrExchange(ShuttleGui & S)
void VSTEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
{
S.SetBorder(5);
S.StartHorizontalLay(wxEXPAND, 1);
@ -724,7 +724,7 @@ void VSTEffectSettingsDialog::PopulateOrExchange(ShuttleGui & S)
Center();
}
void VSTEffectSettingsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
void VSTEffectOptionsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
{
if (!Validate())
{
@ -734,9 +734,9 @@ void VSTEffectSettingsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
ShuttleGui S(this, eIsGettingFromDialog);
PopulateOrExchange(S);
mHost->SetSharedConfig(wxT("Settings"), wxT("BufferSize"), mBufferSize);
mHost->SetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency);
mHost->SetSharedConfig(wxT("Settings"), wxT("UseGUI"), mUseGUI);
mHost->SetSharedConfig(wxT("Options"), wxT("BufferSize"), mBufferSize);
mHost->SetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency);
mHost->SetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI);
EndModal(wxID_OK);
}
@ -1618,8 +1618,8 @@ bool VSTEffect::SetHost(EffectHostInterface *host)
if (mHost)
{
mHost->GetSharedConfig(wxT("Settings"), wxT("BufferSize"), mUserBlockSize, 8192);
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("BufferSize"), mUserBlockSize, 8192);
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
mBlockSize = mUserBlockSize;
@ -2063,7 +2063,7 @@ bool VSTEffect::PopulateUI(wxWindow *parent)
mParent->PushEventHandler(mEventHelper);
// Determine if the VST editor is supposed to be used or not
mHost->GetSharedConfig(wxT("Settings"),
mHost->GetSharedConfig(wxT("Options"),
wxT("UseGUI"),
mGui,
true);
@ -2282,7 +2282,7 @@ bool VSTEffect::HasOptions()
void VSTEffect::ShowOptions()
{
VSTEffectSettingsDialog dlg(mParent, mHost);
VSTEffectOptionsDialog dlg(mParent, mHost);
if (dlg.ShowModal())
{
// Reinitialize configuration settings

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

@ -275,15 +275,15 @@ OSType AudioUnitEffectsModule::ToOSType(const wxString & type)
///////////////////////////////////////////////////////////////////////////////
//
// AudioUnitEffectSettingsDialog
// AudioUnitEffectOptionsDialog
//
///////////////////////////////////////////////////////////////////////////////
class AudioUnitEffectSettingsDialog:public wxDialog
class AudioUnitEffectOptionsDialog:public wxDialog
{
public:
AudioUnitEffectSettingsDialog(wxWindow * parent, EffectHostInterface *host);
virtual ~AudioUnitEffectSettingsDialog();
AudioUnitEffectOptionsDialog(wxWindow * parent, EffectHostInterface *host);
virtual ~AudioUnitEffectOptionsDialog();
void PopulateOrExchange(ShuttleGui & S);
@ -297,27 +297,27 @@ private:
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(AudioUnitEffectSettingsDialog, wxDialog)
EVT_BUTTON(wxID_OK, AudioUnitEffectSettingsDialog::OnOk)
BEGIN_EVENT_TABLE(AudioUnitEffectOptionsDialog, wxDialog)
EVT_BUTTON(wxID_OK, AudioUnitEffectOptionsDialog::OnOk)
END_EVENT_TABLE()
AudioUnitEffectSettingsDialog::AudioUnitEffectSettingsDialog(wxWindow * parent, EffectHostInterface *host)
: wxDialog(parent, wxID_ANY, wxString(_("Audio Unit Effect Settings")))
AudioUnitEffectOptionsDialog::AudioUnitEffectOptionsDialog(wxWindow * parent, EffectHostInterface *host)
: wxDialog(parent, wxID_ANY, wxString(_("Audio Unit Effect Options")))
{
mHost = host;
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Settings"), wxT("UseGUI"), mUseGUI, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
}
AudioUnitEffectSettingsDialog::~AudioUnitEffectSettingsDialog()
AudioUnitEffectOptionsDialog::~AudioUnitEffectOptionsDialog()
{
}
void AudioUnitEffectSettingsDialog::PopulateOrExchange(ShuttleGui & S)
void AudioUnitEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
{
S.SetBorder(5);
S.StartHorizontalLay(wxEXPAND, 1);
@ -364,7 +364,7 @@ void AudioUnitEffectSettingsDialog::PopulateOrExchange(ShuttleGui & S)
Center();
}
void AudioUnitEffectSettingsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
void AudioUnitEffectOptionsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
{
if (!Validate())
{
@ -374,8 +374,8 @@ void AudioUnitEffectSettingsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
ShuttleGui S(this, eIsGettingFromDialog);
PopulateOrExchange(S);
mHost->SetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency);
mHost->SetSharedConfig(wxT("Settings"), wxT("UseGUI"), mUseGUI);
mHost->SetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency);
mHost->SetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI);
EndModal(wxID_OK);
}
@ -1131,8 +1131,8 @@ bool AudioUnitEffect::SetHost(EffectHostInterface *host)
// mHost will be null during registration
if (mHost)
{
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Settings"), wxT("UseGUI"), mUseGUI, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
bool haveDefaults;
mHost->GetPrivateConfig(mHost->GetFactoryDefaultsGroup(), wxT("Initialized"), haveDefaults, false);
@ -2064,8 +2064,11 @@ bool AudioUnitEffect::HasOptions()
void AudioUnitEffect::ShowOptions()
{
AudioUnitEffectSettingsDialog dlg(mParent, mHost);
AudioUnitEffectOptionsDialog dlg(mParent, mHost);
dlg.ShowModal();
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseGUI"), mUseGUI, true);
}
// ============================================================================

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

@ -376,15 +376,15 @@ void LadspaEffectsModule::DeleteInstance(IdentInterface *instance)
///////////////////////////////////////////////////////////////////////////////
//
// LadspaEffectSettingsDialog
// LadspaEffectOptionsDialog
//
///////////////////////////////////////////////////////////////////////////////
class LadspaEffectSettingsDialog:public wxDialog
class LadspaEffectOptionsDialog:public wxDialog
{
public:
LadspaEffectSettingsDialog(wxWindow * parent, EffectHostInterface *host);
virtual ~LadspaEffectSettingsDialog();
LadspaEffectOptionsDialog(wxWindow * parent, EffectHostInterface *host);
virtual ~LadspaEffectOptionsDialog();
void PopulateOrExchange(ShuttleGui & S);
@ -397,26 +397,26 @@ private:
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(LadspaEffectSettingsDialog, wxDialog)
EVT_BUTTON(wxID_OK, LadspaEffectSettingsDialog::OnOk)
BEGIN_EVENT_TABLE(LadspaEffectOptionsDialog, wxDialog)
EVT_BUTTON(wxID_OK, LadspaEffectOptionsDialog::OnOk)
END_EVENT_TABLE()
LadspaEffectSettingsDialog::LadspaEffectSettingsDialog(wxWindow * parent, EffectHostInterface *host)
: wxDialog(parent, wxID_ANY, wxString(_("Ladspa Effect Settings")))
LadspaEffectOptionsDialog::LadspaEffectOptionsDialog(wxWindow * parent, EffectHostInterface *host)
: wxDialog(parent, wxID_ANY, wxString(_("Ladspa Effect Options")))
{
mHost = host;
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
ShuttleGui S(this, eIsCreating);
PopulateOrExchange(S);
}
LadspaEffectSettingsDialog::~LadspaEffectSettingsDialog()
LadspaEffectOptionsDialog::~LadspaEffectOptionsDialog()
{
}
void LadspaEffectSettingsDialog::PopulateOrExchange(ShuttleGui & S)
void LadspaEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
{
S.SetBorder(5);
S.StartHorizontalLay(wxEXPAND, 1);
@ -452,7 +452,7 @@ void LadspaEffectSettingsDialog::PopulateOrExchange(ShuttleGui & S)
Center();
}
void LadspaEffectSettingsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
void LadspaEffectOptionsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
{
if (!Validate())
{
@ -462,7 +462,7 @@ void LadspaEffectSettingsDialog::OnOk(wxCommandEvent & WXUNUSED(evt))
ShuttleGui S(this, eIsGettingFromDialog);
PopulateOrExchange(S);
mHost->SetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency);
mHost->SetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency);
EndModal(wxID_OK);
}
@ -834,7 +834,7 @@ bool LadspaEffect::SetHost(EffectHostInterface *host)
// mHost will be null during registration
if (mHost)
{
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
bool haveDefaults;
mHost->GetPrivateConfig(mHost->GetFactoryDefaultsGroup(), wxT("Initialized"), haveDefaults, false);
@ -1425,11 +1425,11 @@ bool LadspaEffect::HasOptions()
void LadspaEffect::ShowOptions()
{
LadspaEffectSettingsDialog dlg(mParent, mHost);
LadspaEffectOptionsDialog dlg(mParent, mHost);
if (dlg.ShowModal())
{
// Reinitialize configuration settings
mHost->GetSharedConfig(wxT("Settings"), wxT("UseLatency"), mUseLatency, true);
// Reinitialize configuration options
mHost->GetSharedConfig(wxT("Options"), wxT("UseLatency"), mUseLatency, true);
}
}