Classier enums (#6760)

This commit is contained in:
Dominic Clark
2023-08-24 19:16:02 +01:00
committed by GitHub
parent 3aed361b82
commit f10277715f
276 changed files with 2607 additions and 2521 deletions

View File

@@ -58,7 +58,7 @@ SaProcessor::SaProcessor(const SaControls *controls) :
m_reallocating(false)
{
m_fftWindow.resize(m_inBlockSize, 1.0);
precomputeWindow(m_fftWindow.data(), m_inBlockSize, BLACKMAN_HARRIS);
precomputeWindow(m_fftWindow.data(), m_inBlockSize, FFTWindow::BlackmanHarris);
m_bufferL.resize(m_inBlockSize, 0);
m_bufferR.resize(m_inBlockSize, 0);
@@ -402,7 +402,7 @@ void SaProcessor::reallocateBuffers()
// allocate new space, create new plan and resize containers
m_fftWindow.resize(new_in_size, 1.0);
precomputeWindow(m_fftWindow.data(), new_in_size, (FFT_WINDOWS) m_controls->m_windowModel.value());
precomputeWindow(m_fftWindow.data(), new_in_size, (FFTWindow) m_controls->m_windowModel.value());
m_bufferL.resize(new_in_size, 0);
m_bufferR.resize(new_in_size, 0);
m_filteredBufferL.resize(new_fft_size, 0);
@@ -448,7 +448,7 @@ void SaProcessor::rebuildWindow()
{
// computation is done in fft_helpers
QMutexLocker lock(&m_dataAccess);
precomputeWindow(m_fftWindow.data(), m_inBlockSize, (FFT_WINDOWS) m_controls->m_windowModel.value());
precomputeWindow(m_fftWindow.data(), m_inBlockSize, (FFTWindow) m_controls->m_windowModel.value());
}
@@ -545,28 +545,28 @@ float SaProcessor::binBandwidth() const
float SaProcessor::getFreqRangeMin(bool linear) const
{
switch (m_controls->m_freqRangeModel.value())
switch (static_cast<FrequencyRange>(m_controls->m_freqRangeModel.value()))
{
case FRANGE_AUDIBLE: return FRANGE_AUDIBLE_START;
case FRANGE_BASS: return FRANGE_BASS_START;
case FRANGE_MIDS: return FRANGE_MIDS_START;
case FRANGE_HIGH: return FRANGE_HIGH_START;
case FrequencyRange::Audible: return FRANGE_AUDIBLE_START;
case FrequencyRange::Bass: return FRANGE_BASS_START;
case FrequencyRange::Mids: return FRANGE_MIDS_START;
case FrequencyRange::High: return FRANGE_HIGH_START;
default:
case FRANGE_FULL: return linear ? 0 : LOWEST_LOG_FREQ;
case FrequencyRange::Full: return linear ? 0 : LOWEST_LOG_FREQ;
}
}
float SaProcessor::getFreqRangeMax() const
{
switch (m_controls->m_freqRangeModel.value())
switch (static_cast<FrequencyRange>(m_controls->m_freqRangeModel.value()))
{
case FRANGE_AUDIBLE: return FRANGE_AUDIBLE_END;
case FRANGE_BASS: return FRANGE_BASS_END;
case FRANGE_MIDS: return FRANGE_MIDS_END;
case FRANGE_HIGH: return FRANGE_HIGH_END;
case FrequencyRange::Audible: return FRANGE_AUDIBLE_END;
case FrequencyRange::Bass: return FRANGE_BASS_END;
case FrequencyRange::Mids: return FRANGE_MIDS_END;
case FrequencyRange::High: return FRANGE_HIGH_END;
default:
case FRANGE_FULL: return getNyquistFreq();
case FrequencyRange::Full: return getNyquistFreq();
}
}
@@ -619,26 +619,26 @@ float SaProcessor::getAmpRangeMin(bool linear) const
{
// return very low limit to make sure zero gets included at linear grid
if (linear) {return -900;}
switch (m_controls->m_ampRangeModel.value())
switch (static_cast<AmplitudeRange>(m_controls->m_ampRangeModel.value()))
{
case ARANGE_EXTENDED: return ARANGE_EXTENDED_START;
case ARANGE_SILENT: return ARANGE_SILENT_START;
case ARANGE_LOUD: return ARANGE_LOUD_START;
case AmplitudeRange::Extended: return ARANGE_EXTENDED_START;
case AmplitudeRange::Silent: return ARANGE_SILENT_START;
case AmplitudeRange::Loud: return ARANGE_LOUD_START;
default:
case ARANGE_AUDIBLE: return ARANGE_AUDIBLE_START;
case AmplitudeRange::Audible: return ARANGE_AUDIBLE_START;
}
}
float SaProcessor::getAmpRangeMax() const
{
switch (m_controls->m_ampRangeModel.value())
switch (static_cast<AmplitudeRange>(m_controls->m_ampRangeModel.value()))
{
case ARANGE_EXTENDED: return ARANGE_EXTENDED_END;
case ARANGE_SILENT: return ARANGE_SILENT_END;
case ARANGE_LOUD: return ARANGE_LOUD_END;
case AmplitudeRange::Extended: return ARANGE_EXTENDED_END;
case AmplitudeRange::Silent: return ARANGE_SILENT_END;
case AmplitudeRange::Loud: return ARANGE_LOUD_END;
default:
case ARANGE_AUDIBLE: return ARANGE_AUDIBLE_END;
case AmplitudeRange::Audible: return ARANGE_AUDIBLE_END;
}
}