Update of /cvsroot/audacity/audacity-src/src/prefs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14105/src/prefs
Modified Files:
GUIPrefs.cpp PrefsDialog.cpp
Added Files:
EffectsPrefs.cpp EffectsPrefs.h
Log Message:
Added Effects preference pane to allow enabling/disabling of the different
effect types.
Index: PrefsDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/PrefsDialog.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- PrefsDialog.cpp 14 Jul 2009 23:04:52 -0000 1.68
+++ PrefsDialog.cpp 27 Jul 2009 15:36:37 -0000 1.69
@@ -45,6 +45,7 @@
#include "BatchPrefs.h"
#include "DevicePrefs.h"
#include "DirectoriesPrefs.h"
+#include "EffectsPrefs.h"
#include "GUIPrefs.h"
#include "ImportExportPrefs.h"
#include "KeyConfigPrefs.h"
@@ -101,6 +102,7 @@
w = new SpectrumPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new DirectoriesPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
w = new WarningsPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
+ w = new EffectsPrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
#ifdef EXPERIMENTAL_THEME_PREFS
w = new ThemePrefs(mCategories); mCategories->AddPage(w,
w->GetName(), false, 0);
--- NEW FILE: EffectsPrefs.h ---
/**********************************************************************
Audacity: A Digital Audio Editor
EffectsPrefs.h
Brian Gunlogson
Joshua Haberman
James Crook
**********************************************************************/
#ifndef __AUDACITY_EFFECTS_PREFS__
#define __AUDACITY_EFFECTS_PREFS__
#include <wx/defs.h>
#include <wx/arrstr.h>
#include <wx/window.h>
#include "../ShuttleGui.h"
#include "PrefsPanel.h"
class EffectsPrefs:public PrefsPanel
{
public:
EffectsPrefs(wxWindow * parent);
~EffectsPrefs();
virtual bool Apply();
private:
void Populate();
void PopulateOrExchange(ShuttleGui & S);
};
#endif
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: 57018e2b-d264-4f93-bfa7-06752ebf631e
Index: GUIPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/GUIPrefs.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- GUIPrefs.cpp 9 Jul 2009 23:05:00 -0000 1.82
+++ GUIPrefs.cpp 27 Jul 2009 15:36:36 -0000 1.83
@@ -145,11 +145,6 @@
S.TieCheckBox(_("Cl&eanSpeech Mode (Customized GUI)"),
wxT("/Batch/CleanSpeechMode"),
false);
-#if USE_VST
- S.TieCheckBox(_("Display VST effects in GUI mode"),
- wxT("/VST/GUI"),
- true);
-#endif
#ifdef __WXDEBUG__
S.TieCheckBox(_("Don't a&pply effects in batch mode"),
wxT("/Batch/Debug"),
--- NEW FILE: EffectsPrefs.cpp ---
/**********************************************************************
Audacity: A Digital Audio Editor
EffectsPrefs.cpp
Brian Gunlogson
Joshua Haberman
Dominic Mazzoni
James Crook
*******************************************************************//**
\class EffectsPrefs
\brief A PrefsPanel for general GUI prefernces.
*//*******************************************************************/
#include "../Audacity.h"
#include <wx/defs.h>
#include "../AudacityApp.h"
#include "../Languages.h"
#include "../Prefs.h"
#include "../ShuttleGui.h"
#include "EffectsPrefs.h"
EffectsPrefs::EffectsPrefs(wxWindow * parent)
: PrefsPanel(parent, _("Effects"))
{
Populate();
}
EffectsPrefs::~EffectsPrefs()
{
}
void EffectsPrefs::Populate()
{
//------------------------- Main section --------------------
// Now construct the GUI itself.
// Use 'eIsCreatingFromPrefs' so that the GUI is
// initialised with values from gPrefs.
ShuttleGui S(this, eIsCreatingFromPrefs);
PopulateOrExchange(S);
// ----------------------- End of main section --------------
}
void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
{
S.SetBorder(2);
S.StartStatic(_("Enable"));
{
#if USE_NYQUIST
S.TieCheckBox(_("Nyquist effects"),
wxT("/Nyquist/Enable"),
true);
#endif
#if USE_LADSPA
S.TieCheckBox(_("LADSPA effects"),
wxT("/Ladspa/Enable"),
true);
#endif
#if USE_VST
S.TieCheckBox(_("VST effects"),
wxT("/VST/Enable"),
true);
#endif
#if USE_AUDIO_UNITS
S.TieCheckBox(_("Audio Unit effects"),
wxT("/AudioUnits/Enable"),
true);
#endif
#if USE_VAMP
S.TieCheckBox(_("VAMP effects"),
wxT("/VAMP/Enable"),
true);
#endif
S.AddFixedText(_("Audacity must be restarted for changes to take
affect."));
}
S.EndStatic();
S.StartStatic(_("Mode"));
{
#if USE_VST
S.TieCheckBox(_("Display VST effects in graphical mode"),
wxT("/VST/GUI"),
true);
#endif
#if USE_AUDIO_UNITS
S.TieCheckBox(_("Display Audio Unit effects in graphical mode"),
wxT("/AudioUnits/GUI"),
true);
#endif
}
S.EndStatic();
}
bool EffectsPrefs::Apply()
{
ShuttleGui S(this, eIsSavingToPrefs);
PopulateOrExchange(S);
// If language has changed, we want to change it now, not on the next reboot.
wxString lang = gPrefs->Read(wxT("/Locale/Language"), wxT(""));
wxGetApp().InitLang(lang);
return true;
}
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: 7e997d04-6b94-4abb-b3d6-748400f86598
------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
