@@ -42,7 +42,7 @@ void Oscillator::AttachParameterToSourceImpl(OscillatorParameter parameter, std:
4242
4343void Oscillator::Reset (float phase)
4444{
45- float clampedPhase = clamp (phase, 0 .0f , ( float ) WAVETABLE_SIZE);
45+ float clampedPhase = clamp (phase, 0 .0f , static_cast < float >( WAVETABLE_SIZE) );
4646 m_phase = clampedPhase;
4747 if (m_follower != nullptr ) {
4848 m_follower->Reset (clampedPhase);
@@ -52,7 +52,7 @@ void Oscillator::Reset(float phase)
5252void Oscillator::SetFrequency (float frequency)
5353{
5454 p_frequency = frequency;
55- m_phaseIncrement = p_frequency * ( float ) WAVETABLE_SIZE / ( float ) m_context.sampleRate ;
55+ m_phaseIncrement = p_frequency * static_cast < float >( WAVETABLE_SIZE) / static_cast < float >( m_context.sampleRate ) ;
5656}
5757
5858void Oscillator::SetWaveform (Waveform waveform)
@@ -75,16 +75,16 @@ void Oscillator::DetachFollower()
7575void Oscillator::PopulateWavetable ()
7676{
7777 for (size_t idx = 0 ; idx < WAVETABLE_SIZE; idx++) {
78- float phase = ( float ) idx * PI * 2 .0f / ( float ) WAVETABLE_SIZE;
78+ float phase = static_cast < float >( idx) * PI * 2 .0f / static_cast < float >( WAVETABLE_SIZE) ;
7979 m_wavetable[idx] = sin (phase);
8080 }
8181}
8282
8383void Oscillator::IncrementPhase ()
8484{
8585 m_phase += m_phaseIncrement;
86- if (m_phase >= ( float ) WAVETABLE_SIZE) {
87- m_phase -= ( float ) WAVETABLE_SIZE;
86+ if (m_phase >= static_cast < float >( WAVETABLE_SIZE) ) {
87+ m_phase -= static_cast < float >( WAVETABLE_SIZE) ;
8888 if (m_follower != nullptr ) {
8989 m_follower->Reset (m_phase);
9090 }
@@ -95,7 +95,7 @@ Sample Oscillator::Lerp()
9595{
9696 size_t truncatedIdx = m_phase;
9797 size_t nextIdx = (truncatedIdx + 1 ) % WAVETABLE_SIZE;
98- float nextIdxWeight = m_phase - ( float ) truncatedIdx;
98+ float nextIdxWeight = m_phase - static_cast < float >( truncatedIdx) ;
9999 float truncatedIdxWeight = 1 .0f - nextIdxWeight;
100100
101101 return (m_wavetable[truncatedIdx] * truncatedIdxWeight) + (m_wavetable[nextIdx] * nextIdxWeight);
0 commit comments