Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17388/src/prefs
Modified Files:
SpectrumPrefs.cpp SpectrumPrefs.h
Log Message:
Getting rid of last bits of AutoMaxFrequency.
Index: SpectrumPrefs.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/SpectrumPrefs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- SpectrumPrefs.h 2 Jan 2007 01:05:14 -0000 1.8
+++ SpectrumPrefs.h 28 Jan 2007 16:03:25 -0000 1.9
@@ -12,11 +12,9 @@
Salvo Ventura
November 2006
- Added selection box for windowType and checkBox for AutoMaxFrequency
- to scale the y axis in spectrum view
+ Added selection box for windowType
All params are saved in config file.
- Disable the MaxFreq control when AutoMaxFrequency is TRUE (thx to James)
*/
@@ -40,15 +38,11 @@
private:
void Populate();
- void OnCheckAutoMaxFrequency(wxCommandEvent &event);
void PopulateOrExchange( ShuttleGui & S );
wxString minFreqStr;
wxString maxFreqStr;
int windowType;
- bool autoMaxFrequency;
-public:
- DECLARE_EVENT_TABLE();
};
#endif
Index: SpectrumPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/SpectrumPrefs.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- SpectrumPrefs.cpp 2 Jan 2007 01:05:14 -0000 1.17
+++ SpectrumPrefs.cpp 28 Jan 2007 16:03:25 -0000 1.18
@@ -26,15 +26,10 @@
#include "../FFT.h"
enum {
- ID_AUTOMAXFREQUENCY = 8000,
- ID_MINFREQUENCY,
+ ID_MINFREQUENCY = 8000,
ID_MAXFREQUENCY
};
-BEGIN_EVENT_TABLE(SpectrumPrefs, wxPanel)
- EVT_CHECKBOX(ID_AUTOMAXFREQUENCY, SpectrumPrefs::OnCheckAutoMaxFrequency)
-END_EVENT_TABLE()
-
SpectrumPrefs::SpectrumPrefs(wxWindow * parent):
PrefsPanel(parent)
{
@@ -43,10 +38,6 @@
Populate( );
}
-void SpectrumPrefs::OnCheckAutoMaxFrequency(wxCommandEvent &event) {
- FindWindow( ID_MAXFREQUENCY )->Enable( !event.IsChecked() );
-}
-
void SpectrumPrefs::Populate( )
{
int minFreq;
@@ -57,7 +48,6 @@
gPrefs->Read(wxT("/Spectrum/MaxFreq"), &maxFreq, 8000L);
gPrefs->Read(wxT("/Spectrum/MinFreq"), &minFreq, 0L);
gPrefs->Read(wxT("/Spectrum/WindowType"), &windowType, 3L);
- gPrefs->Read(wxT("/Spectrum/AutoMaxFrequency"), &autoMaxFrequency, false);
minFreqStr.Printf(wxT("%d"), minFreq);
maxFreqStr.Printf(wxT("%d"), maxFreq);
@@ -120,15 +110,9 @@
12 // max number of characters (used to size the control).
);
S.EndTwoColumn();
- // auto max frequency: will always set to Fs/2: if automax is true,
- // then the other control should be grayed out
- S.Id(ID_AUTOMAXFREQUENCY).TieCheckBox( _("&Auto max frequency (Fs/2)"),
wxT("/Spectrum/AutoMaxFrequency"), false);
}
S.EndStatic();
S.EndHorizontalLay();
-
- gPrefs->Read(wxT("/Spectrum/AutoMaxFrequency"), &autoMaxFrequency, false);
- FindWindow( ID_MAXFREQUENCY )->Enable(!autoMaxFrequency);
}
@@ -171,7 +155,6 @@
gPrefs->Write(wxT("/Spectrum/MinFreq"), minFreq);
gPrefs->Write(wxT("/Spectrum/MaxFreq"), maxFreq);
gPrefs->Write(wxT("/Spectrum/WindowType"), windowType);
- gPrefs->Write(wxT("/Spectrum/AutoMaxFrequency"), autoMaxFrequency);
// TODO: Force all projects to repaint themselves
return true;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
