Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-11 15:16:27 +01:00
Code Issues Releases Wiki Activity

reassignment added to list of algorithms in settings and preferences

Browse Source
This commit is contained in:
Paul Licameli
2015-05-31 14:58:20 -04:00
parent c4f7e25c1c
commit 1f94d99c43
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/prefs/SpectrogramSettings.cpp
View File

@@ -190,6 +190,8 @@ const wxArrayString &SpectrogramSettings::GetAlgorithmNames()
if (theArray.IsEmpty()) { if (theArray.IsEmpty()) {
// Keep in correspondence with enum SpectrogramSettings::Algorithm: // Keep in correspondence with enum SpectrogramSettings::Algorithm:
theArray.Add(_("Frequencies")); theArray.Add(_("Frequencies"));
/* i18n-hint: the Reassignment algorithm for spectrograms */
theArray.Add(_("Reassignment"));
/* i18n-hint: EAC abbreviates "Enhanced Autocorrelation" */ /* i18n-hint: EAC abbreviates "Enhanced Autocorrelation" */
theArray.Add(_("Pitch (EAC)")); theArray.Add(_("Pitch (EAC)"));
} }
@@ -557,7 +559,7 @@ int SpectrogramSettings::GetFFTLength() const
{ {
return windowSize return windowSize
#ifdef EXPERIMENTAL_ZERO_PADDED_SPECTROGRAMS #ifdef EXPERIMENTAL_ZERO_PADDED_SPECTROGRAMS
* ((algorithm == algSTFT) ? zeroPaddingFactor : 1); * ((algorithm != algPitchEAC) ? zeroPaddingFactor : 1);
#endif #endif
; ;
} }

1
src/prefs/SpectrogramSettings.h
View File

@@ -130,6 +130,7 @@ public:
enum Algorithm { enum Algorithm {
algSTFT = 0, algSTFT = 0,
algReassignment,
algPitchEAC, algPitchEAC,
algNumAlgorithms, algNumAlgorithms,

3
src/prefs/SpectrumPrefs.cpp
View File

@@ -459,7 +459,8 @@ void SpectrumPrefs::OnAlgorithm(wxCommandEvent &evt)
void SpectrumPrefs::EnableDisableSTFTOnlyControls() void SpectrumPrefs::EnableDisableSTFTOnlyControls()
{ {
// Enable or disable other controls that are applicable only to STFT. // Enable or disable other controls that are applicable only to STFT.
const bool STFT = (mAlgorithmChoice->GetSelection() == 0); const bool STFT =
(mAlgorithmChoice->GetSelection() != SpectrogramSettings::algPitchEAC);
mGain->Enable(STFT); mGain->Enable(STFT);
mRange->Enable(STFT); mRange->Enable(STFT);
mFrequencyGain->Enable(STFT); mFrequencyGain->Enable(STFT);