mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2026-06-02 14:04:47 -04:00
CLEANUP: some compiler and static analysis warnings
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#include "FFTDataDistributor.h"
|
||||
|
||||
FFTDataDistributor::FFTDataDistributor() : outputBuffers("FFTDataDistributorBuffers"), fftSize(DEFAULT_FFT_SIZE), linesPerSecond(DEFAULT_WATERFALL_LPS), lineRateAccum(0.0) {
|
||||
bufferedItems = 0;
|
||||
|
||||
}
|
||||
|
||||
void FFTDataDistributor::setFFTSize(unsigned int fftSize) {
|
||||
@@ -60,14 +60,14 @@ void FFTDataDistributor::process() {
|
||||
double lineRateStep = ((double)linesPerSecond * inputTime)/(double)inputLines;
|
||||
|
||||
if (bufferedItems >= fftSize) {
|
||||
int numProcessed = 0;
|
||||
size_t numProcessed = 0;
|
||||
|
||||
if (lineRateAccum + (lineRateStep * ((double)bufferedItems/(double)fftSize)) < 1.0) {
|
||||
// move along, nothing to see here..
|
||||
lineRateAccum += (lineRateStep * ((double)bufferedItems/(double)fftSize));
|
||||
numProcessed = bufferedItems;
|
||||
} else {
|
||||
for (unsigned int i = 0, iMax = bufferedItems; i < iMax; i += fftSize) {
|
||||
for (size_t i = 0, iMax = bufferedItems; i < iMax; i += fftSize) {
|
||||
if ((i + fftSize) > iMax) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -23,5 +23,7 @@ protected:
|
||||
unsigned int fftSize;
|
||||
unsigned int linesPerSecond;
|
||||
double lineRateAccum;
|
||||
size_t bufferMax, bufferOffset, bufferedItems;
|
||||
size_t bufferMax = 0;
|
||||
size_t bufferOffset = 0;
|
||||
size_t bufferedItems = 0;
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
class ScopeRenderData: public ReferenceCounter {
|
||||
public:
|
||||
std::vector<float> waveform_points;
|
||||
ScopePanel::ScopeMode mode;
|
||||
ScopePanel::ScopeMode mode = ScopePanel::SCOPE_MODE_Y;
|
||||
int inputRate;
|
||||
int sampleRate;
|
||||
int channels;
|
||||
@@ -39,7 +39,7 @@ protected:
|
||||
std::vector<liquid_float_complex> fftOutput;
|
||||
fftplan fftPlan;
|
||||
|
||||
unsigned int fftSize;
|
||||
unsigned int fftSize = 0;
|
||||
int desiredInputSize;
|
||||
unsigned int maxScopeSamples;
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@ SpectrumVisualProcessor::SpectrumVisualProcessor() : outputBuffers("SpectrumVisu
|
||||
|
||||
fft_ceil_ma = fft_ceil_maa = 100.0;
|
||||
fft_floor_ma = fft_floor_maa = 0.0;
|
||||
fft_floor_peak = 0.0;
|
||||
desiredInputSize.store(0);
|
||||
fft_average_rate = 0.65f;
|
||||
scaleFactor.store(1.0);
|
||||
|
||||
@@ -87,7 +87,7 @@ protected:
|
||||
// distribute outputs
|
||||
std::lock_guard < std::recursive_mutex > busy_lock(busy_update);
|
||||
|
||||
output->setRefCount(outputs.size());
|
||||
output->setRefCount((int)outputs.size());
|
||||
for (outputs_i = outputs.begin(); outputs_i != outputs.end(); outputs_i++) {
|
||||
|
||||
if (!(*outputs_i)->push(output)) {
|
||||
@@ -96,7 +96,7 @@ protected:
|
||||
}
|
||||
}
|
||||
|
||||
ThreadQueue<InputDataType *> *input;
|
||||
ThreadQueue<InputDataType *> *input = nullptr;
|
||||
std::vector<ThreadQueue<OutputDataType *> *> outputs;
|
||||
typename std::vector<ThreadQueue<OutputDataType *> *>::iterator outputs_i;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user