From 19198ea66543f0ff6ce18366d2f6ce42318ba93f Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Tue, 16 Jul 2019 22:13:47 -0400 Subject: [PATCH] Improves `const` usage. --- .../Speaker/Implementation/LowpassSpeaker.hpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Outputs/Speaker/Implementation/LowpassSpeaker.hpp b/Outputs/Speaker/Implementation/LowpassSpeaker.hpp index 7a8ac79f1..6e2364ee3 100644 --- a/Outputs/Speaker/Implementation/LowpassSpeaker.hpp +++ b/Outputs/Speaker/Implementation/LowpassSpeaker.hpp @@ -62,7 +62,7 @@ template class LowpassSpeaker: public Speaker { std::lock_guard lock_guard(filter_parameters_mutex_); filter_parameters_.output_cycles_per_second = cycles_per_second; filter_parameters_.parameters_are_dirty = true; - output_buffer_.resize(static_cast(buffer_size)); + output_buffer_.resize(std::size_t(buffer_size)); } /*! @@ -106,7 +106,7 @@ template class LowpassSpeaker: public Speaker { void run_for(const Cycles cycles) { if(!delegate_) return; - std::size_t cycles_remaining = static_cast(cycles.as_int()); + std::size_t cycles_remaining = size_t(cycles.as_int()); if(!cycles_remaining) return; FilterParameters filter_parameters; @@ -126,7 +126,7 @@ template class LowpassSpeaker: public Speaker { if( filter_parameters.input_cycles_per_second == filter_parameters.output_cycles_per_second && filter_parameters.high_frequency_cutoff < 0.0) { while(cycles_remaining) { - std::size_t cycles_to_read = std::min(output_buffer_.size() - output_buffer_pointer_, cycles_remaining); + const auto cycles_to_read = std::min(output_buffer_.size() - output_buffer_pointer_, cycles_remaining); sample_source_.get_samples(cycles_to_read, &output_buffer_[output_buffer_pointer_]); output_buffer_pointer_ += cycles_to_read; @@ -143,11 +143,11 @@ template class LowpassSpeaker: public Speaker { return; } - // if the output rate is less than the input rate, or an additional cut-off has been specified, use the filter. + // If the output rate is less than the input rate, or an additional cut-off has been specified, use the filter. if( filter_parameters.input_cycles_per_second > filter_parameters.output_cycles_per_second || (filter_parameters.input_cycles_per_second == filter_parameters.output_cycles_per_second && filter_parameters.high_frequency_cutoff >= 0.0)) { while(cycles_remaining) { - std::size_t cycles_to_read = std::min(cycles_remaining, input_buffer_.size() - input_buffer_depth_); + const auto cycles_to_read = std::min(cycles_remaining, input_buffer_.size() - input_buffer_depth_); sample_source_.get_samples(cycles_to_read, &input_buffer_[input_buffer_depth_]); cycles_remaining -= cycles_to_read; input_buffer_depth_ += cycles_to_read; @@ -165,9 +165,9 @@ template class LowpassSpeaker: public Speaker { // If the next loop around is going to reuse some of the samples just collected, use a memmove to // preserve them in the correct locations (TODO: use a longer buffer to fix that) and don't skip // anything. Otherwise skip as required to get to the next sample batch and don't expect to reuse. - uint64_t steps = stepper_->step(); + const auto steps = stepper_->step(); if(steps < input_buffer_.size()) { - int16_t *input_buffer = input_buffer_.data(); + auto *const input_buffer = input_buffer_.data(); std::memmove( input_buffer, &input_buffer[steps], sizeof(int16_t) * (input_buffer_.size() - steps)); @@ -213,15 +213,15 @@ template class LowpassSpeaker: public Speaker { } // Make a guess at a good number of taps. - std::size_t number_of_taps = static_cast( + std::size_t number_of_taps = std::size_t( ceilf((filter_parameters.input_cycles_per_second + high_pass_frequency) / high_pass_frequency) ); number_of_taps = (number_of_taps * 2) | 1; output_buffer_pointer_ = 0; stepper_.reset(new SignalProcessing::Stepper( - static_cast(filter_parameters.input_cycles_per_second), - static_cast(filter_parameters.output_cycles_per_second))); + uint64_t(filter_parameters.input_cycles_per_second), + uint64_t(filter_parameters.output_cycles_per_second))); filter_.reset(new SignalProcessing::FIRFilter( static_cast(number_of_taps), @@ -230,7 +230,7 @@ template class LowpassSpeaker: public Speaker { high_pass_frequency, SignalProcessing::FIRFilter::DefaultAttenuation)); - input_buffer_.resize(static_cast(number_of_taps)); + input_buffer_.resize(std::size_t(number_of_taps)); input_buffer_depth_ = 0; } };