Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-17 16:50:26 +02:00
Code Issues Releases Wiki Activity

Merge better fix for compiling NoiseReduction.cpp with wx3- configurations

Browse Source 
Conflicts:
	src/effects/NoiseReduction.cpp
This commit is contained in:
Paul-Licameli 2015-04-12 22:24:43 -04:00
commit f638c1504c
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/effects/NoiseReduction.cpp
View File

@ -1457,34 +1457,47 @@ struct ControlInfo {
// (valueMin - valueMax) / sliderMax is the value increment of the slider // (valueMin - valueMax) / sliderMax is the value increment of the slider
const wxChar* format; const wxChar* format;
bool formatAsInt; bool formatAsInt;
const wxChar* textBoxCaption_; wxString textBoxCaption() const { return wxGetTranslation(textBoxCaption_); } const wxString textBoxCaption_; wxString textBoxCaption() const { return wxGetTranslation(textBoxCaption_); }
const wxChar* sliderName_; wxString sliderName() const { return wxGetTranslation(sliderName_); } const wxString sliderName_; wxString sliderName() const { return wxGetTranslation(sliderName_); }
}; const ControlInfo *controlInfo() { static const ControlInfo table[] = {
{ &EffectNoiseReduction::Settings::mNoiseGain, ControlInfo(MemberPointer f, double vMin, double vMax, long sMax, const wxChar* fmt, bool fAsInt,
0.0, 48.0, 48, wxT("%d"), true, const wxString &caption, const wxString &name)
WX3_STRING_FIX(wxTRANSLATE("&Noise reduction (dB):")), WX3_STRING_FIX(wxTRANSLATE("Noise reduction")) }, : field(f), valueMin(vMin), valueMax(vMax), sliderMax(sMax), format(fmt), formatAsInt(fAsInt)
{ &EffectNoiseReduction::Settings::mNewSensitivity, , textBoxCaption_(caption), sliderName_(name)
0.0, 24.0, 48, wxT("%.2f"), false, {
WX3_STRING_FIX(wxTRANSLATE("&Sensitivity:")), WX3_STRING_FIX(wxTRANSLATE("Sensitivity")) }, }
};
const ControlInfo *controlInfo() {
static const ControlInfo table[] = {
{ &EffectNoiseReduction::Settings::mNoiseGain,
0.0, 48.0, 48, wxT("%d"), true,
wxTRANSLATE("&Noise reduction (dB):"), wxTRANSLATE("Noise reduction") },
{ &EffectNoiseReduction::Settings::mNewSensitivity,
0.0, 24.0, 48, wxT("%.2f"), false,
wxTRANSLATE("&Sensitivity:"), wxTRANSLATE("Sensitivity") },
#ifdef ATTACK_AND_RELEASE #ifdef ATTACK_AND_RELEASE
{ &EffectNoiseReduction::Settings::mAttackTime, { &EffectNoiseReduction::Settings::mAttackTime,
0, 1.0, 100, wxT("%.2f"), false, 0, 1.0, 100, wxT("%.2f"), false,
WX3_STRING_FIX(wxTRANSLATE("Attac&k time (secs):")), WX3_STRING_FIX(wxTRANSLATE("Attack time")) }, wxTRANSLATE("Attac&k time (secs):"), wxTRANSLATE("Attack time") },
{ &EffectNoiseReduction::Settings::mReleaseTime, { &EffectNoiseReduction::Settings::mReleaseTime,
0, 1.0, 100, wxT("%.2f"), false, 0, 1.0, 100, wxT("%.2f"), false,
WX3_STRING_FIX(wxTRANSLATE("R&elease time (secs):")), WX3_STRING_FIX(wxTRANSLATE("Release time")) }, wxTRANSLATE("R&elease time (secs):"), wxTRANSLATE("Release time") },
#endif #endif
{ &EffectNoiseReduction::Settings::mFreqSmoothingBands, { &EffectNoiseReduction::Settings::mFreqSmoothingBands,
0, 6, 6, wxT("%d"), true, 0, 6, 6, wxT("%d"), true,
WX3_STRING_FIX(wxTRANSLATE("&Frequency smoothing (bands):")), WX3_STRING_FIX(wxTRANSLATE("Frequency smoothing")) }, wxTRANSLATE("&Frequency smoothing (bands):"), wxTRANSLATE("Frequency smoothing") },
#ifdef ADVANCED_SETTINGS #ifdef ADVANCED_SETTINGS
{ &EffectNoiseReduction::Settings::mOldSensitivity, { &EffectNoiseReduction::Settings::mOldSensitivity,
-20.0, 20.0, 4000, wxT("%.2f"), false, -20.0, 20.0, 4000, wxT("%.2f"), false,
WX3_STRING_FIX(wxTRANSLATE("Sensiti&vity (dB):")), WX3_STRING_FIX(wxTRANSLATE("Old Sensitivity")) }, wxTRANSLATE("Sensiti&vity (dB):"), wxTRANSLATE("Old Sensitivity") },
// add here // add here
#endif #endif
}; return table; } };
return table;
}
} // namespace } // namespace