Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-10 17:11:17 +02:00
Code Issues Releases Wiki Activity

Bug1347: Need defense against bad values in .cfg file for meter refresh

Browse Source
This commit is contained in:
Paul Licameli 2016-04-05 16:11:47 -04:00
parent 59f08a6d97
commit 7886464688
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/Meter.cpp
View File

@ -42,6 +42,7 @@
#include "Meter.h" #include "Meter.h"
#include "../AudacityApp.h" #include "../AudacityApp.h"
#include <algorithm>
#include <wx/defs.h> #include <wx/defs.h>
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/dcbuffer.h> #include <wx/dcbuffer.h>
@ -73,6 +74,9 @@
#include "../Experimental.h" #include "../Experimental.h"
#include "../widgets/valnum.h" #include "../widgets/valnum.h"
static const long MIN_REFRESH_RATE = 1;
static const long MAX_REFRESH_RATE = 100;
/* Updates to the meter are passed accross via meter updates, each contained in /* Updates to the meter are passed accross via meter updates, each contained in
* a MeterUpdateMsg object */ * a MeterUpdateMsg object */
wxString MeterUpdateMsg::toString() wxString MeterUpdateMsg::toString()
@ -375,7 +379,9 @@ void Meter::UpdatePrefs()
{ {
mDBRange = gPrefs->Read(ENV_DB_KEY, ENV_DB_RANGE); mDBRange = gPrefs->Read(ENV_DB_KEY, ENV_DB_RANGE);
mMeterRefreshRate = gPrefs->Read(Key(wxT("RefreshRate")), 30); mMeterRefreshRate =
std::max(MIN_REFRESH_RATE, std::min(MAX_REFRESH_RATE,
gPrefs->Read(Key(wxT("RefreshRate")), 30)));
mGradient = gPrefs->Read(Key(wxT("Bars")), wxT("Gradient")) == wxT("Gradient"); mGradient = gPrefs->Read(Key(wxT("Bars")), wxT("Gradient")) == wxT("Gradient");
mDB = gPrefs->Read(Key(wxT("Type")), wxT("dB")) == wxT("dB"); mDB = gPrefs->Read(Key(wxT("Type")), wxT("dB")) == wxT("dB");
mMeterDisabled = gPrefs->Read(Key(wxT("Disabled")), (long)0); mMeterDisabled = gPrefs->Read(Key(wxT("Disabled")), (long)0);
@ -1942,7 +1948,8 @@ void Meter::OnPreferences(wxCommandEvent & WXUNUSED(event))
10); 10);
rate->SetName(_("Meter refresh rate per second [1-100]")); rate->SetName(_("Meter refresh rate per second [1-100]"));
IntegerValidator<long> vld(&mMeterRefreshRate); IntegerValidator<long> vld(&mMeterRefreshRate);
vld.SetRange(1, 100);
vld.SetRange(MIN_REFRESH_RATE, MAX_REFRESH_RATE);
rate->SetValidator(vld); rate->SetValidator(vld);
} }
S.EndHorizontalLay(); S.EndHorizontalLay();