From 68e4eaac68d40376fd77cd03460905fff0509a39 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 15 Jun 2019 07:00:09 +0200 Subject: [PATCH] PVS-Studio analys fixes: core package minor issues --- .../demodfreedv/freedvdemodsettings.cpp | 2 - plugins/channeltx/modatv/atvmod.h | 4 +- .../channeltx/modfreedv/freedvmodsettings.cpp | 2 - .../soapysdroutput/soapysdroutput.cpp | 2 +- sdrbase/audio/audioopus.cpp | 2 +- sdrbase/dsp/interpolatorsif.h | 536 +++++++++--------- sdrbase/dsp/samplesourcefifo.cpp | 1 + sdrbase/util/rtpsink.cpp | 2 - sdrgui/soapygui/arginfogui.cpp | 18 +- 9 files changed, 291 insertions(+), 278 deletions(-) diff --git a/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp b/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp index 6a33a1d72..df82be177 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp @@ -152,8 +152,6 @@ int FreeDVDemodSettings::getHiCutoff(FreeDVMode freeDVMode) switch(freeDVMode) { case FreeDVMode800XA: // C4FM NB - return 2400.0; - break; case FreeDVMode700C: // OFDM case FreeDVMode700D: // OFDM case FreeDVMode1600: // OFDM diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index 9dd1ce2ea..18075b5c4 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -598,10 +598,10 @@ private: switch(m_settings.m_atvModInput) { case ATVModSettings::ATVModInputHBars: - sample = (pointIndex / m_pointsPerHBar) * m_hBarIncrement + m_blackLevel; + sample = (((float)pointIndex) / m_pointsPerHBar) * m_hBarIncrement + m_blackLevel; break; case ATVModSettings::ATVModInputVBars: - sample = (iLine / m_linesPerVBar) * m_vBarIncrement + m_blackLevel; + sample = (((float)iLine) / m_linesPerVBar) * m_vBarIncrement + m_blackLevel; break; case ATVModSettings::ATVModInputChessboard: sample = (((iLine / m_linesPerVBar)*5 + (pointIndex / m_pointsPerHBar)) % 2) * m_spanLevel * m_settings.m_uniformLevel + m_blackLevel; diff --git a/plugins/channeltx/modfreedv/freedvmodsettings.cpp b/plugins/channeltx/modfreedv/freedvmodsettings.cpp index bb2f169cb..392f57416 100644 --- a/plugins/channeltx/modfreedv/freedvmodsettings.cpp +++ b/plugins/channeltx/modfreedv/freedvmodsettings.cpp @@ -177,8 +177,6 @@ int FreeDVModSettings::getHiCutoff(FreeDVMode freeDVMode) switch(freeDVMode) { case FreeDVModSettings::FreeDVMode800XA: // C4FM NB - return 2400.0; - break; case FreeDVModSettings::FreeDVMode700C: // OFDM case FreeDVModSettings::FreeDVMode700D: // OFDM case FreeDVModSettings::FreeDVMode1600: // OFDM diff --git a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp index d56955393..abd92f1ab 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp @@ -1285,7 +1285,7 @@ bool SoapySDROutput::applySettings(const SoapySDROutputSettings& settings, bool if (getMessageQueueToGUI()) { - MsgReportGainChange *report = MsgReportGainChange::create(m_settings, individualGainsChanged, globalGainChanged); + MsgReportGainChange *report = MsgReportGainChange::create(m_settings, globalGainChanged, individualGainsChanged); getMessageQueueToGUI()->push(report); } } diff --git a/sdrbase/audio/audioopus.cpp b/sdrbase/audio/audioopus.cpp index be1e61fe1..2cb04c32e 100644 --- a/sdrbase/audio/audioopus.cpp +++ b/sdrbase/audio/audioopus.cpp @@ -54,7 +54,7 @@ void AudioOpus::setEncoder(int32_t fs, int nChannels) if (error != OPUS_OK) { - qWarning("AudioOpus::setEncoder: %s error: %s", newInstance ? "create" : "init", opus_strerror(error)); + qWarning("AudioOpus::setEncoder: error: %s", opus_strerror(error)); m_encoderOK = false; return; } diff --git a/sdrbase/dsp/interpolatorsif.h b/sdrbase/dsp/interpolatorsif.h index a51f0f37d..38c2f4619 100644 --- a/sdrbase/dsp/interpolatorsif.h +++ b/sdrbase/dsp/interpolatorsif.h @@ -181,10 +181,10 @@ void InterpolatorsIF::interpolate2_cen(SampleVector::iterator* m_interpolator2.myInterpolate(&intbuf[0], &intbuf[1], &intbuf[2], &intbuf[3]); - buf[pos+0] = intbuf[0] / interpolation_shifts::post2; - buf[pos+1] = intbuf[1] / interpolation_shifts::post2; - buf[pos+2] = intbuf[2] / interpolation_shifts::post2; - buf[pos+3] = intbuf[3] / interpolation_shifts::post2; + buf[pos+0] = (float) (intbuf[0] / interpolation_shifts::post2); + buf[pos+1] = (float) (intbuf[1] / interpolation_shifts::post2); + buf[pos+2] = (float) (intbuf[2] / interpolation_shifts::post2); + buf[pos+3] = (float) (intbuf[3] / interpolation_shifts::post2); ++(*it); } @@ -224,14 +224,14 @@ void InterpolatorsIF::interpolate2_inf(SampleVector::iterator* m_interpolator2.myInterpolateInf(&intbuf[0], &intbuf[1], &intbuf[2], &intbuf[3], &intbuf[4], &intbuf[5], &intbuf[6], &intbuf[7]); - buf[pos+0] = intbuf[0] / interpolation_shifts::post2; - buf[pos+1] = intbuf[1] / interpolation_shifts::post2; - buf[pos+2] = intbuf[2] / interpolation_shifts::post2; - buf[pos+3] = intbuf[3] / interpolation_shifts::post2; - buf[pos+4] = intbuf[4] / interpolation_shifts::post2; - buf[pos+5] = intbuf[5] / interpolation_shifts::post2; - buf[pos+6] = intbuf[6] / interpolation_shifts::post2; - buf[pos+7] = intbuf[7] / interpolation_shifts::post2; + buf[pos+0] = (float) (intbuf[0] / interpolation_shifts::post2); + buf[pos+1] = (float) (intbuf[1] / interpolation_shifts::post2); + buf[pos+2] = (float) (intbuf[2] / interpolation_shifts::post2); + buf[pos+3] = (float) (intbuf[3] / interpolation_shifts::post2); + buf[pos+4] = (float) (intbuf[4] / interpolation_shifts::post2); + buf[pos+5] = (float) (intbuf[5] / interpolation_shifts::post2); + buf[pos+6] = (float) (intbuf[6] / interpolation_shifts::post2); + buf[pos+7] = (float) (intbuf[7] / interpolation_shifts::post2); } } @@ -269,14 +269,14 @@ void InterpolatorsIF::interpolate2_sup(SampleVector::iterator* m_interpolator2.myInterpolateSup(&intbuf[0], &intbuf[1], &intbuf[2], &intbuf[3], &intbuf[4], &intbuf[5], &intbuf[6], &intbuf[7]); - buf[pos+0] = intbuf[0] / interpolation_shifts::post2; - buf[pos+1] = intbuf[1] / interpolation_shifts::post2; - buf[pos+2] = intbuf[2] / interpolation_shifts::post2; - buf[pos+3] = intbuf[3] / interpolation_shifts::post2; - buf[pos+4] = intbuf[4] / interpolation_shifts::post2; - buf[pos+5] = intbuf[5] / interpolation_shifts::post2; - buf[pos+6] = intbuf[6] / interpolation_shifts::post2; - buf[pos+7] = intbuf[7] / interpolation_shifts::post2; + buf[pos+0] = (float) (intbuf[0] / interpolation_shifts::post2); + buf[pos+1] = (float) (intbuf[1] / interpolation_shifts::post2); + buf[pos+2] = (float) (intbuf[2] / interpolation_shifts::post2); + buf[pos+3] = (float) (intbuf[3] / interpolation_shifts::post2); + buf[pos+4] = (float) (intbuf[4] / interpolation_shifts::post2); + buf[pos+5] = (float) (intbuf[5] / interpolation_shifts::post2); + buf[pos+6] = (float) (intbuf[6] / interpolation_shifts::post2); + buf[pos+7] = (float) (intbuf[7] / interpolation_shifts::post2); } } @@ -308,14 +308,14 @@ void InterpolatorsIF::interpolate4_cen(SampleVector::iterator* m_interpolator4.myInterpolate(&intbuf[0], &intbuf[1], &intbuf[2], &intbuf[3]); m_interpolator4.myInterpolate(&intbuf[4], &intbuf[5], &intbuf[6], &intbuf[7]); - buf[pos+0] = intbuf[0] / interpolation_shifts::post4; - buf[pos+1] = intbuf[1] / interpolation_shifts::post4; - buf[pos+2] = intbuf[2] / interpolation_shifts::post4; - buf[pos+3] = intbuf[3] / interpolation_shifts::post4; - buf[pos+4] = intbuf[4] / interpolation_shifts::post4; - buf[pos+5] = intbuf[5] / interpolation_shifts::post4; - buf[pos+6] = intbuf[6] / interpolation_shifts::post4; - buf[pos+7] = intbuf[7] / interpolation_shifts::post4; + buf[pos+0] = (float) (intbuf[0] / interpolation_shifts::post4); + buf[pos+1] = (float) (intbuf[1] / interpolation_shifts::post4); + buf[pos+2] = (float) (intbuf[2] / interpolation_shifts::post4); + buf[pos+3] = (float) (intbuf[3] / interpolation_shifts::post4); + buf[pos+4] = (float) (intbuf[4] / interpolation_shifts::post4); + buf[pos+5] = (float) (intbuf[5] / interpolation_shifts::post4); + buf[pos+6] = (float) (intbuf[6] / interpolation_shifts::post4); + buf[pos+7] = (float) (intbuf[7] / interpolation_shifts::post4); ++(*it); } @@ -358,7 +358,7 @@ void InterpolatorsIF::interpolate4_inf(SampleVector::iterator* m_interpolator4.myInterpolateInf(&intbuf[8], &intbuf[9], &intbuf[10], &intbuf[11], &intbuf[12], &intbuf[13], &intbuf[14], &intbuf[15]); for (int i = 0; i < 16; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post4; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post4); } } } @@ -400,7 +400,7 @@ void InterpolatorsIF::interpolate4_sup(SampleVector::iterator* m_interpolator4.myInterpolateSup(&intbuf[8], &intbuf[9], &intbuf[10], &intbuf[11], &intbuf[12], &intbuf[13], &intbuf[14], &intbuf[15]); for (int i = 0; i < 16; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post4; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post4); } } } @@ -438,22 +438,22 @@ void InterpolatorsIF::interpolate8_cen(SampleVector::iterator* m_interpolator8.myInterpolate(&intbuf[8], &intbuf[9], &intbuf[10], &intbuf[11]); m_interpolator8.myInterpolate(&intbuf[12], &intbuf[13], &intbuf[14], &intbuf[15]); - buf[pos+0] = intbuf[0] / interpolation_shifts::post8; - buf[pos+1] = intbuf[1] / interpolation_shifts::post8; - buf[pos+2] = intbuf[2] / interpolation_shifts::post8; - buf[pos+3] = intbuf[3] / interpolation_shifts::post8; - buf[pos+4] = intbuf[4] / interpolation_shifts::post8; - buf[pos+5] = intbuf[5] / interpolation_shifts::post8; - buf[pos+6] = intbuf[6] / interpolation_shifts::post8; - buf[pos+7] = intbuf[7] / interpolation_shifts::post8; - buf[pos+8] = intbuf[8] / interpolation_shifts::post8; - buf[pos+9] = intbuf[9] / interpolation_shifts::post8; - buf[pos+10] = intbuf[10] / interpolation_shifts::post8; - buf[pos+11] = intbuf[11] / interpolation_shifts::post8; - buf[pos+12] = intbuf[12] / interpolation_shifts::post8; - buf[pos+13] = intbuf[13] / interpolation_shifts::post8; - buf[pos+14] = intbuf[14] / interpolation_shifts::post8; - buf[pos+15] = intbuf[15] / interpolation_shifts::post8; + buf[pos+0] = (float) (intbuf[0] / interpolation_shifts::post8); + buf[pos+1] = (float) (intbuf[1] / interpolation_shifts::post8); + buf[pos+2] = (float) (intbuf[2] / interpolation_shifts::post8); + buf[pos+3] = (float) (intbuf[3] / interpolation_shifts::post8); + buf[pos+4] = (float) (intbuf[4] / interpolation_shifts::post8); + buf[pos+5] = (float) (intbuf[5] / interpolation_shifts::post8); + buf[pos+6] = (float) (intbuf[6] / interpolation_shifts::post8); + buf[pos+7] = (float) (intbuf[7] / interpolation_shifts::post8); + buf[pos+8] = (float) (intbuf[8] / interpolation_shifts::post8); + buf[pos+9] = (float) (intbuf[9] / interpolation_shifts::post8); + buf[pos+10] = (float) (intbuf[10] / interpolation_shifts::post8); + buf[pos+11] = (float) (intbuf[11] / interpolation_shifts::post8); + buf[pos+12] = (float) (intbuf[12] / interpolation_shifts::post8); + buf[pos+13] = (float) (intbuf[13] / interpolation_shifts::post8); + buf[pos+14] = (float) (intbuf[14] / interpolation_shifts::post8); + buf[pos+15] = (float) (intbuf[15] / interpolation_shifts::post8); ++(*it); } @@ -501,7 +501,7 @@ void InterpolatorsIF::interpolate8_inf(SampleVector::iterator* m_interpolator8.myInterpolateInf(&intbuf[24], &intbuf[25], &intbuf[26], &intbuf[27], &intbuf[28], &intbuf[29], &intbuf[30], &intbuf[31]); for (int i = 0; i < 32; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post8; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post8); } } } @@ -548,7 +548,7 @@ void InterpolatorsIF::interpolate8_sup(SampleVector::iterator* m_interpolator8.myInterpolateSup(&intbuf[24], &intbuf[25], &intbuf[26], &intbuf[27], &intbuf[28], &intbuf[29], &intbuf[30], &intbuf[31]); for (int i = 0; i < 32; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post8; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post8); } } } @@ -595,38 +595,38 @@ void InterpolatorsIF::interpolate16_cen(SampleVector::iterator* m_interpolator16.myInterpolate(&intbuf[24], &intbuf[25], &intbuf[26], &intbuf[27]); m_interpolator16.myInterpolate(&intbuf[28], &intbuf[29], &intbuf[30], &intbuf[31]); - buf[pos+0] = intbuf[0] / interpolation_shifts::post16; - buf[pos+1] = intbuf[1] / interpolation_shifts::post16; - buf[pos+2] = intbuf[2] / interpolation_shifts::post16; - buf[pos+3] = intbuf[3] / interpolation_shifts::post16; - buf[pos+4] = intbuf[4] / interpolation_shifts::post16; - buf[pos+5] = intbuf[5] / interpolation_shifts::post16; - buf[pos+6] = intbuf[6] / interpolation_shifts::post16; - buf[pos+7] = intbuf[7] / interpolation_shifts::post16; - buf[pos+8] = intbuf[8] / interpolation_shifts::post16; - buf[pos+9] = intbuf[9] / interpolation_shifts::post16; - buf[pos+10] = intbuf[10] / interpolation_shifts::post16; - buf[pos+11] = intbuf[11] / interpolation_shifts::post16; - buf[pos+12] = intbuf[12] / interpolation_shifts::post16; - buf[pos+13] = intbuf[13] / interpolation_shifts::post16; - buf[pos+14] = intbuf[14] / interpolation_shifts::post16; - buf[pos+15] = intbuf[15] / interpolation_shifts::post16; - buf[pos+16] = intbuf[16] / interpolation_shifts::post16; - buf[pos+17] = intbuf[17] / interpolation_shifts::post16; - buf[pos+18] = intbuf[18] / interpolation_shifts::post16; - buf[pos+19] = intbuf[19] / interpolation_shifts::post16; - buf[pos+20] = intbuf[20] / interpolation_shifts::post16; - buf[pos+21] = intbuf[21] / interpolation_shifts::post16; - buf[pos+22] = intbuf[22] / interpolation_shifts::post16; - buf[pos+23] = intbuf[23] / interpolation_shifts::post16; - buf[pos+24] = intbuf[24] / interpolation_shifts::post16; - buf[pos+25] = intbuf[25] / interpolation_shifts::post16; - buf[pos+26] = intbuf[26] / interpolation_shifts::post16; - buf[pos+27] = intbuf[27] / interpolation_shifts::post16; - buf[pos+28] = intbuf[28] / interpolation_shifts::post16; - buf[pos+29] = intbuf[29] / interpolation_shifts::post16; - buf[pos+30] = intbuf[30] / interpolation_shifts::post16; - buf[pos+31] = intbuf[31] / interpolation_shifts::post16; + buf[pos+0] = (float) (intbuf[0] / interpolation_shifts::post16); + buf[pos+1] = (float) (intbuf[1] / interpolation_shifts::post16); + buf[pos+2] = (float) (intbuf[2] / interpolation_shifts::post16); + buf[pos+3] = (float) (intbuf[3] / interpolation_shifts::post16); + buf[pos+4] = (float) (intbuf[4] / interpolation_shifts::post16); + buf[pos+5] = (float) (intbuf[5] / interpolation_shifts::post16); + buf[pos+6] = (float) (intbuf[6] / interpolation_shifts::post16); + buf[pos+7] = (float) (intbuf[7] / interpolation_shifts::post16); + buf[pos+8] = (float) (intbuf[8] / interpolation_shifts::post16); + buf[pos+9] = (float) (intbuf[9] / interpolation_shifts::post16); + buf[pos+10] = (float) (intbuf[10] / interpolation_shifts::post16); + buf[pos+11] = (float) (intbuf[11] / interpolation_shifts::post16); + buf[pos+12] = (float) (intbuf[12] / interpolation_shifts::post16); + buf[pos+13] = (float) (intbuf[13] / interpolation_shifts::post16); + buf[pos+14] = (float) (intbuf[14] / interpolation_shifts::post16); + buf[pos+15] = (float) (intbuf[15] / interpolation_shifts::post16); + buf[pos+16] = (float) (intbuf[16] / interpolation_shifts::post16); + buf[pos+17] = (float) (intbuf[17] / interpolation_shifts::post16); + buf[pos+18] = (float) (intbuf[18] / interpolation_shifts::post16); + buf[pos+19] = (float) (intbuf[19] / interpolation_shifts::post16); + buf[pos+20] = (float) (intbuf[20] / interpolation_shifts::post16); + buf[pos+21] = (float) (intbuf[21] / interpolation_shifts::post16); + buf[pos+22] = (float) (intbuf[22] / interpolation_shifts::post16); + buf[pos+23] = (float) (intbuf[23] / interpolation_shifts::post16); + buf[pos+24] = (float) (intbuf[24] / interpolation_shifts::post16); + buf[pos+25] = (float) (intbuf[25] / interpolation_shifts::post16); + buf[pos+26] = (float) (intbuf[26] / interpolation_shifts::post16); + buf[pos+27] = (float) (intbuf[27] / interpolation_shifts::post16); + buf[pos+28] = (float) (intbuf[28] / interpolation_shifts::post16); + buf[pos+29] = (float) (intbuf[29] / interpolation_shifts::post16); + buf[pos+30] = (float) (intbuf[30] / interpolation_shifts::post16); + buf[pos+31] = (float) (intbuf[31] / interpolation_shifts::post16); ++(*it); } @@ -683,7 +683,7 @@ void InterpolatorsIF::interpolate16_inf(SampleVector::iterator* m_interpolator16.myInterpolateInf(&intbuf[56], &intbuf[57], &intbuf[58], &intbuf[59], &intbuf[60], &intbuf[61], &intbuf[62], &intbuf[63]); for (int i = 0; i < 64; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post16; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post16); } } } @@ -739,7 +739,7 @@ void InterpolatorsIF::interpolate16_sup(SampleVector::iterator* m_interpolator16.myInterpolateSup(&intbuf[56], &intbuf[57], &intbuf[58], &intbuf[59], &intbuf[60], &intbuf[61], &intbuf[62], &intbuf[63]); for (int i = 0; i < 64; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post16; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post16); } } } @@ -802,70 +802,70 @@ void InterpolatorsIF::interpolate32_cen(SampleVector::iterator* m_interpolator32.myInterpolate(&intbuf[56], &intbuf[57], &intbuf[58], &intbuf[59]); m_interpolator32.myInterpolate(&intbuf[60], &intbuf[61], &intbuf[62], &intbuf[63]); - buf[pos+0] = intbuf[0] / interpolation_shifts::post32; - buf[pos+1] = intbuf[1] / interpolation_shifts::post32; - buf[pos+2] = intbuf[2] / interpolation_shifts::post32; - buf[pos+3] = intbuf[3] / interpolation_shifts::post32; - buf[pos+4] = intbuf[4] / interpolation_shifts::post32; - buf[pos+5] = intbuf[5] / interpolation_shifts::post32; - buf[pos+6] = intbuf[6] / interpolation_shifts::post32; - buf[pos+7] = intbuf[7] / interpolation_shifts::post32; - buf[pos+8] = intbuf[8] / interpolation_shifts::post32; - buf[pos+9] = intbuf[9] / interpolation_shifts::post32; - buf[pos+10] = intbuf[10] / interpolation_shifts::post32; - buf[pos+11] = intbuf[11] / interpolation_shifts::post32; - buf[pos+12] = intbuf[12] / interpolation_shifts::post32; - buf[pos+13] = intbuf[13] / interpolation_shifts::post32; - buf[pos+14] = intbuf[14] / interpolation_shifts::post32; - buf[pos+15] = intbuf[15] / interpolation_shifts::post32; - buf[pos+16] = intbuf[16] / interpolation_shifts::post32; - buf[pos+17] = intbuf[17] / interpolation_shifts::post32; - buf[pos+18] = intbuf[18] / interpolation_shifts::post32; - buf[pos+19] = intbuf[19] / interpolation_shifts::post32; - buf[pos+20] = intbuf[20] / interpolation_shifts::post32; - buf[pos+21] = intbuf[21] / interpolation_shifts::post32; - buf[pos+22] = intbuf[22] / interpolation_shifts::post32; - buf[pos+23] = intbuf[23] / interpolation_shifts::post32; - buf[pos+24] = intbuf[24] / interpolation_shifts::post32; - buf[pos+25] = intbuf[25] / interpolation_shifts::post32; - buf[pos+26] = intbuf[26] / interpolation_shifts::post32; - buf[pos+27] = intbuf[27] / interpolation_shifts::post32; - buf[pos+28] = intbuf[28] / interpolation_shifts::post32; - buf[pos+29] = intbuf[29] / interpolation_shifts::post32; - buf[pos+30] = intbuf[30] / interpolation_shifts::post32; - buf[pos+31] = intbuf[31] / interpolation_shifts::post32; - buf[pos+32] = intbuf[32] / interpolation_shifts::post32; - buf[pos+33] = intbuf[33] / interpolation_shifts::post32; - buf[pos+34] = intbuf[34] / interpolation_shifts::post32; - buf[pos+35] = intbuf[35] / interpolation_shifts::post32; - buf[pos+36] = intbuf[36] / interpolation_shifts::post32; - buf[pos+37] = intbuf[37] / interpolation_shifts::post32; - buf[pos+38] = intbuf[38] / interpolation_shifts::post32; - buf[pos+39] = intbuf[39] / interpolation_shifts::post32; - buf[pos+40] = intbuf[40] / interpolation_shifts::post32; - buf[pos+41] = intbuf[41] / interpolation_shifts::post32; - buf[pos+42] = intbuf[42] / interpolation_shifts::post32; - buf[pos+43] = intbuf[43] / interpolation_shifts::post32; - buf[pos+44] = intbuf[44] / interpolation_shifts::post32; - buf[pos+45] = intbuf[45] / interpolation_shifts::post32; - buf[pos+46] = intbuf[46] / interpolation_shifts::post32; - buf[pos+47] = intbuf[47] / interpolation_shifts::post32; - buf[pos+48] = intbuf[48] / interpolation_shifts::post32; - buf[pos+49] = intbuf[49] / interpolation_shifts::post32; - buf[pos+50] = intbuf[50] / interpolation_shifts::post32; - buf[pos+51] = intbuf[51] / interpolation_shifts::post32; - buf[pos+52] = intbuf[52] / interpolation_shifts::post32; - buf[pos+53] = intbuf[53] / interpolation_shifts::post32; - buf[pos+54] = intbuf[54] / interpolation_shifts::post32; - buf[pos+55] = intbuf[55] / interpolation_shifts::post32; - buf[pos+56] = intbuf[56] / interpolation_shifts::post32; - buf[pos+57] = intbuf[57] / interpolation_shifts::post32; - buf[pos+58] = intbuf[58] / interpolation_shifts::post32; - buf[pos+59] = intbuf[59] / interpolation_shifts::post32; - buf[pos+60] = intbuf[60] / interpolation_shifts::post32; - buf[pos+61] = intbuf[61] / interpolation_shifts::post32; - buf[pos+62] = intbuf[62] / interpolation_shifts::post32; - buf[pos+63] = intbuf[63] / interpolation_shifts::post32; + buf[pos+0] = (float) (intbuf[0] / interpolation_shifts::post32); + buf[pos+1] = (float) (intbuf[1] / interpolation_shifts::post32); + buf[pos+2] = (float) (intbuf[2] / interpolation_shifts::post32); + buf[pos+3] = (float) (intbuf[3] / interpolation_shifts::post32); + buf[pos+4] = (float) (intbuf[4] / interpolation_shifts::post32); + buf[pos+5] = (float) (intbuf[5] / interpolation_shifts::post32); + buf[pos+6] = (float) (intbuf[6] / interpolation_shifts::post32); + buf[pos+7] = (float) (intbuf[7] / interpolation_shifts::post32); + buf[pos+8] = (float) (intbuf[8] / interpolation_shifts::post32); + buf[pos+9] = (float) (intbuf[9] / interpolation_shifts::post32); + buf[pos+10] = (float) (intbuf[10] / interpolation_shifts::post32); + buf[pos+11] = (float) (intbuf[11] / interpolation_shifts::post32); + buf[pos+12] = (float) (intbuf[12] / interpolation_shifts::post32); + buf[pos+13] = (float) (intbuf[13] / interpolation_shifts::post32); + buf[pos+14] = (float) (intbuf[14] / interpolation_shifts::post32); + buf[pos+15] = (float) (intbuf[15] / interpolation_shifts::post32); + buf[pos+16] = (float) (intbuf[16] / interpolation_shifts::post32); + buf[pos+17] = (float) (intbuf[17] / interpolation_shifts::post32); + buf[pos+18] = (float) (intbuf[18] / interpolation_shifts::post32); + buf[pos+19] = (float) (intbuf[19] / interpolation_shifts::post32); + buf[pos+20] = (float) (intbuf[20] / interpolation_shifts::post32); + buf[pos+21] = (float) (intbuf[21] / interpolation_shifts::post32); + buf[pos+22] = (float) (intbuf[22] / interpolation_shifts::post32); + buf[pos+23] = (float) (intbuf[23] / interpolation_shifts::post32); + buf[pos+24] = (float) (intbuf[24] / interpolation_shifts::post32); + buf[pos+25] = (float) (intbuf[25] / interpolation_shifts::post32); + buf[pos+26] = (float) (intbuf[26] / interpolation_shifts::post32); + buf[pos+27] = (float) (intbuf[27] / interpolation_shifts::post32); + buf[pos+28] = (float) (intbuf[28] / interpolation_shifts::post32); + buf[pos+29] = (float) (intbuf[29] / interpolation_shifts::post32); + buf[pos+30] = (float) (intbuf[30] / interpolation_shifts::post32); + buf[pos+31] = (float) (intbuf[31] / interpolation_shifts::post32); + buf[pos+32] = (float) (intbuf[32] / interpolation_shifts::post32); + buf[pos+33] = (float) (intbuf[33] / interpolation_shifts::post32); + buf[pos+34] = (float) (intbuf[34] / interpolation_shifts::post32); + buf[pos+35] = (float) (intbuf[35] / interpolation_shifts::post32); + buf[pos+36] = (float) (intbuf[36] / interpolation_shifts::post32); + buf[pos+37] = (float) (intbuf[37] / interpolation_shifts::post32); + buf[pos+38] = (float) (intbuf[38] / interpolation_shifts::post32); + buf[pos+39] = (float) (intbuf[39] / interpolation_shifts::post32); + buf[pos+40] = (float) (intbuf[40] / interpolation_shifts::post32); + buf[pos+41] = (float) (intbuf[41] / interpolation_shifts::post32); + buf[pos+42] = (float) (intbuf[42] / interpolation_shifts::post32); + buf[pos+43] = (float) (intbuf[43] / interpolation_shifts::post32); + buf[pos+44] = (float) (intbuf[44] / interpolation_shifts::post32); + buf[pos+45] = (float) (intbuf[45] / interpolation_shifts::post32); + buf[pos+46] = (float) (intbuf[46] / interpolation_shifts::post32); + buf[pos+47] = (float) (intbuf[47] / interpolation_shifts::post32); + buf[pos+48] = (float) (intbuf[48] / interpolation_shifts::post32); + buf[pos+49] = (float) (intbuf[49] / interpolation_shifts::post32); + buf[pos+50] = (float) (intbuf[50] / interpolation_shifts::post32); + buf[pos+51] = (float) (intbuf[51] / interpolation_shifts::post32); + buf[pos+52] = (float) (intbuf[52] / interpolation_shifts::post32); + buf[pos+53] = (float) (intbuf[53] / interpolation_shifts::post32); + buf[pos+54] = (float) (intbuf[54] / interpolation_shifts::post32); + buf[pos+55] = (float) (intbuf[55] / interpolation_shifts::post32); + buf[pos+56] = (float) (intbuf[56] / interpolation_shifts::post32); + buf[pos+57] = (float) (intbuf[57] / interpolation_shifts::post32); + buf[pos+58] = (float) (intbuf[58] / interpolation_shifts::post32); + buf[pos+59] = (float) (intbuf[59] / interpolation_shifts::post32); + buf[pos+60] = (float) (intbuf[60] / interpolation_shifts::post32); + buf[pos+61] = (float) (intbuf[61] / interpolation_shifts::post32); + buf[pos+62] = (float) (intbuf[62] / interpolation_shifts::post32); + buf[pos+63] = (float) (intbuf[63] / interpolation_shifts::post32); ++(*it); } @@ -1012,7 +1012,7 @@ void InterpolatorsIF::interpolate32_sup(SampleVector::iterator* m_interpolator32.myInterpolateSup(&intbuf[120], &intbuf[121], &intbuf[122], &intbuf[123], &intbuf[124], &intbuf[125], &intbuf[126], &intbuf[127]); for (int i = 0; i < 128; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post32; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post32); } } } @@ -1108,116 +1108,134 @@ void InterpolatorsIF::interpolate64_cen(SampleVector::iterator* m_interpolator64.myInterpolate(&intbuf[120], &intbuf[121], &intbuf[122], &intbuf[123]); m_interpolator64.myInterpolate(&intbuf[124], &intbuf[125], &intbuf[126], &intbuf[127]); - buf[pos+0] = intbuf[0] / interpolation_shifts::post64; - buf[pos+1] = intbuf[1] / interpolation_shifts::post64; - buf[pos+2] = intbuf[2] / interpolation_shifts::post64; - buf[pos+3] = intbuf[3] / interpolation_shifts::post64; - buf[pos+4] = intbuf[4] / interpolation_shifts::post64; - buf[pos+5] = intbuf[5] / interpolation_shifts::post64; - buf[pos+6] = intbuf[6] / interpolation_shifts::post64; - buf[pos+7] = intbuf[7] / interpolation_shifts::post64; - buf[pos+8] = intbuf[8] / interpolation_shifts::post64; - buf[pos+9] = intbuf[9] / interpolation_shifts::post64; - buf[pos+10] = intbuf[10] / interpolation_shifts::post64; - buf[pos+11] = intbuf[11] / interpolation_shifts::post64; - buf[pos+12] = intbuf[12] / interpolation_shifts::post64; - buf[pos+13] = intbuf[13] / interpolation_shifts::post64; - buf[pos+14] = intbuf[14] / interpolation_shifts::post64; - buf[pos+15] = intbuf[15] / interpolation_shifts::post64; - buf[pos+16] = intbuf[16] / interpolation_shifts::post64; - buf[pos+17] = intbuf[17] / interpolation_shifts::post64; - buf[pos+18] = intbuf[18] / interpolation_shifts::post64; - buf[pos+19] = intbuf[19] / interpolation_shifts::post64; - buf[pos+20] = intbuf[20] / interpolation_shifts::post64; - buf[pos+21] = intbuf[21] / interpolation_shifts::post64; - buf[pos+22] = intbuf[22] / interpolation_shifts::post64; - buf[pos+23] = intbuf[23] / interpolation_shifts::post64; - buf[pos+24] = intbuf[24] / interpolation_shifts::post64; - buf[pos+25] = intbuf[25] / interpolation_shifts::post64; - buf[pos+26] = intbuf[26] / interpolation_shifts::post64; - buf[pos+27] = intbuf[27] / interpolation_shifts::post64; - buf[pos+28] = intbuf[28] / interpolation_shifts::post64; - buf[pos+29] = intbuf[29] / interpolation_shifts::post64; - buf[pos+30] = intbuf[30] / interpolation_shifts::post64; - buf[pos+31] = intbuf[31] / interpolation_shifts::post64; - buf[pos+32] = intbuf[32] / interpolation_shifts::post64; - buf[pos+33] = intbuf[33] / interpolation_shifts::post64; - buf[pos+34] = intbuf[34] / interpolation_shifts::post64; - buf[pos+35] = intbuf[35] / interpolation_shifts::post64; - buf[pos+36] = intbuf[36] / interpolation_shifts::post64; - buf[pos+37] = intbuf[37] / interpolation_shifts::post64; - buf[pos+38] = intbuf[38] / interpolation_shifts::post64; - buf[pos+39] = intbuf[39] / interpolation_shifts::post64; - buf[pos+40] = intbuf[40] / interpolation_shifts::post64; - buf[pos+41] = intbuf[41] / interpolation_shifts::post64; - buf[pos+42] = intbuf[42] / interpolation_shifts::post64; - buf[pos+43] = intbuf[43] / interpolation_shifts::post64; - buf[pos+44] = intbuf[44] / interpolation_shifts::post64; - buf[pos+45] = intbuf[45] / interpolation_shifts::post64; - buf[pos+46] = intbuf[46] / interpolation_shifts::post64; - buf[pos+47] = intbuf[47] / interpolation_shifts::post64; - buf[pos+48] = intbuf[48] / interpolation_shifts::post64; - buf[pos+49] = intbuf[49] / interpolation_shifts::post64; - buf[pos+50] = intbuf[50] / interpolation_shifts::post64; - buf[pos+51] = intbuf[51] / interpolation_shifts::post64; - buf[pos+52] = intbuf[52] / interpolation_shifts::post64; - buf[pos+53] = intbuf[53] / interpolation_shifts::post64; - buf[pos+54] = intbuf[54] / interpolation_shifts::post64; - buf[pos+55] = intbuf[55] / interpolation_shifts::post64; - buf[pos+56] = intbuf[56] / interpolation_shifts::post64; - buf[pos+57] = intbuf[57] / interpolation_shifts::post64; - buf[pos+58] = intbuf[58] / interpolation_shifts::post64; - buf[pos+59] = intbuf[59] / interpolation_shifts::post64; - buf[pos+60] = intbuf[60] / interpolation_shifts::post64; - buf[pos+61] = intbuf[61] / interpolation_shifts::post64; - buf[pos+62] = intbuf[62] / interpolation_shifts::post64; - buf[pos+63] = intbuf[63] / interpolation_shifts::post64; - buf[pos+64] = intbuf[64] / interpolation_shifts::post64; - buf[pos+65] = intbuf[65] / interpolation_shifts::post64; - buf[pos+66] = intbuf[66] / interpolation_shifts::post64; - buf[pos+67] = intbuf[67] / interpolation_shifts::post64; - buf[pos+68] = intbuf[68] / interpolation_shifts::post64; - buf[pos+69] = intbuf[69] / interpolation_shifts::post64; - buf[pos+70] = intbuf[70] / interpolation_shifts::post64; - buf[pos+71] = intbuf[71] / interpolation_shifts::post64; - buf[pos+72] = intbuf[72] / interpolation_shifts::post64; - buf[pos+73] = intbuf[73] / interpolation_shifts::post64; - buf[pos+74] = intbuf[74] / interpolation_shifts::post64; - buf[pos+75] = intbuf[75] / interpolation_shifts::post64; - buf[pos+76] = intbuf[76] / interpolation_shifts::post64; - buf[pos+77] = intbuf[77] / interpolation_shifts::post64; - buf[pos+78] = intbuf[78] / interpolation_shifts::post64; - buf[pos+79] = intbuf[79] / interpolation_shifts::post64; - buf[pos+80] = intbuf[80] / interpolation_shifts::post64; - buf[pos+81] = intbuf[81] / interpolation_shifts::post64; - buf[pos+82] = intbuf[82] / interpolation_shifts::post64; - buf[pos+83] = intbuf[83] / interpolation_shifts::post64; - buf[pos+84] = intbuf[84] / interpolation_shifts::post64; - buf[pos+85] = intbuf[85] / interpolation_shifts::post64; - buf[pos+86] = intbuf[86] / interpolation_shifts::post64; - buf[pos+87] = intbuf[87] / interpolation_shifts::post64; - buf[pos+88] = intbuf[88] / interpolation_shifts::post64; - buf[pos+89] = intbuf[89] / interpolation_shifts::post64; - buf[pos+90] = intbuf[90] / interpolation_shifts::post64; - buf[pos+91] = intbuf[91] / interpolation_shifts::post64; - buf[pos+92] = intbuf[92] / interpolation_shifts::post64; - buf[pos+93] = intbuf[93] / interpolation_shifts::post64; - buf[pos+94] = intbuf[94] / interpolation_shifts::post64; - buf[pos+95] = intbuf[95] / interpolation_shifts::post64; - buf[pos+96] = intbuf[96] / interpolation_shifts::post64; - buf[pos+97] = intbuf[97] / interpolation_shifts::post64; - buf[pos+98] = intbuf[98] / interpolation_shifts::post64; - buf[pos+99] = intbuf[99] / interpolation_shifts::post64; - buf[pos+100] = intbuf[100] / interpolation_shifts::post64; - buf[pos+101] = intbuf[101] / interpolation_shifts::post64; - buf[pos+102] = intbuf[102] / interpolation_shifts::post64; - buf[pos+103] = intbuf[103] / interpolation_shifts::post64; - buf[pos+104] = intbuf[104] / interpolation_shifts::post64; - buf[pos+105] = intbuf[105] / interpolation_shifts::post64; - buf[pos+106] = intbuf[106] / interpolation_shifts::post64; - buf[pos+107] = intbuf[107] / interpolation_shifts::post64; - buf[pos+108] = intbuf[108] / interpolation_shifts::post64; - buf[pos+109] = intbuf[109] / interpolation_shifts::post64; + buf[pos+0] = (float) (intbuf[0] / interpolation_shifts::post64); + buf[pos+1] = (float) (intbuf[1] / interpolation_shifts::post64); + buf[pos+2] = (float) (intbuf[2] / interpolation_shifts::post64); + buf[pos+3] = (float) (intbuf[3] / interpolation_shifts::post64); + buf[pos+4] = (float) (intbuf[4] / interpolation_shifts::post64); + buf[pos+5] = (float) (intbuf[5] / interpolation_shifts::post64); + buf[pos+6] = (float) (intbuf[6] / interpolation_shifts::post64); + buf[pos+7] = (float) (intbuf[7] / interpolation_shifts::post64); + buf[pos+8] = (float) (intbuf[8] / interpolation_shifts::post64); + buf[pos+9] = (float) (intbuf[9] / interpolation_shifts::post64); + buf[pos+10] = (float) (intbuf[10] / interpolation_shifts::post64); + buf[pos+11] = (float) (intbuf[11] / interpolation_shifts::post64); + buf[pos+12] = (float) (intbuf[12] / interpolation_shifts::post64); + buf[pos+13] = (float) (intbuf[13] / interpolation_shifts::post64); + buf[pos+14] = (float) (intbuf[14] / interpolation_shifts::post64); + buf[pos+15] = (float) (intbuf[15] / interpolation_shifts::post64); + buf[pos+16] = (float) (intbuf[16] / interpolation_shifts::post64); + buf[pos+17] = (float) (intbuf[17] / interpolation_shifts::post64); + buf[pos+18] = (float) (intbuf[18] / interpolation_shifts::post64); + buf[pos+19] = (float) (intbuf[19] / interpolation_shifts::post64); + buf[pos+20] = (float) (intbuf[20] / interpolation_shifts::post64); + buf[pos+21] = (float) (intbuf[21] / interpolation_shifts::post64); + buf[pos+22] = (float) (intbuf[22] / interpolation_shifts::post64); + buf[pos+23] = (float) (intbuf[23] / interpolation_shifts::post64); + buf[pos+24] = (float) (intbuf[24] / interpolation_shifts::post64); + buf[pos+25] = (float) (intbuf[25] / interpolation_shifts::post64); + buf[pos+26] = (float) (intbuf[26] / interpolation_shifts::post64); + buf[pos+27] = (float) (intbuf[27] / interpolation_shifts::post64); + buf[pos+28] = (float) (intbuf[28] / interpolation_shifts::post64); + buf[pos+29] = (float) (intbuf[29] / interpolation_shifts::post64); + buf[pos+30] = (float) (intbuf[30] / interpolation_shifts::post64); + buf[pos+31] = (float) (intbuf[31] / interpolation_shifts::post64); + buf[pos+32] = (float) (intbuf[32] / interpolation_shifts::post64); + buf[pos+33] = (float) (intbuf[33] / interpolation_shifts::post64); + buf[pos+34] = (float) (intbuf[34] / interpolation_shifts::post64); + buf[pos+35] = (float) (intbuf[35] / interpolation_shifts::post64); + buf[pos+36] = (float) (intbuf[36] / interpolation_shifts::post64); + buf[pos+37] = (float) (intbuf[37] / interpolation_shifts::post64); + buf[pos+38] = (float) (intbuf[38] / interpolation_shifts::post64); + buf[pos+39] = (float) (intbuf[39] / interpolation_shifts::post64); + buf[pos+40] = (float) (intbuf[40] / interpolation_shifts::post64); + buf[pos+41] = (float) (intbuf[41] / interpolation_shifts::post64); + buf[pos+42] = (float) (intbuf[42] / interpolation_shifts::post64); + buf[pos+43] = (float) (intbuf[43] / interpolation_shifts::post64); + buf[pos+44] = (float) (intbuf[44] / interpolation_shifts::post64); + buf[pos+45] = (float) (intbuf[45] / interpolation_shifts::post64); + buf[pos+46] = (float) (intbuf[46] / interpolation_shifts::post64); + buf[pos+47] = (float) (intbuf[47] / interpolation_shifts::post64); + buf[pos+48] = (float) (intbuf[48] / interpolation_shifts::post64); + buf[pos+49] = (float) (intbuf[49] / interpolation_shifts::post64); + buf[pos+50] = (float) (intbuf[50] / interpolation_shifts::post64); + buf[pos+51] = (float) (intbuf[51] / interpolation_shifts::post64); + buf[pos+52] = (float) (intbuf[52] / interpolation_shifts::post64); + buf[pos+53] = (float) (intbuf[53] / interpolation_shifts::post64); + buf[pos+54] = (float) (intbuf[54] / interpolation_shifts::post64); + buf[pos+55] = (float) (intbuf[55] / interpolation_shifts::post64); + buf[pos+56] = (float) (intbuf[56] / interpolation_shifts::post64); + buf[pos+57] = (float) (intbuf[57] / interpolation_shifts::post64); + buf[pos+58] = (float) (intbuf[58] / interpolation_shifts::post64); + buf[pos+59] = (float) (intbuf[59] / interpolation_shifts::post64); + buf[pos+60] = (float) (intbuf[60] / interpolation_shifts::post64); + buf[pos+61] = (float) (intbuf[61] / interpolation_shifts::post64); + buf[pos+62] = (float) (intbuf[62] / interpolation_shifts::post64); + buf[pos+63] = (float) (intbuf[63] / interpolation_shifts::post64); + buf[pos+64] = (float) (intbuf[64] / interpolation_shifts::post64); + buf[pos+65] = (float) (intbuf[65] / interpolation_shifts::post64); + buf[pos+66] = (float) (intbuf[66] / interpolation_shifts::post64); + buf[pos+67] = (float) (intbuf[67] / interpolation_shifts::post64); + buf[pos+68] = (float) (intbuf[68] / interpolation_shifts::post64); + buf[pos+69] = (float) (intbuf[69] / interpolation_shifts::post64); + buf[pos+70] = (float) (intbuf[70] / interpolation_shifts::post64); + buf[pos+71] = (float) (intbuf[71] / interpolation_shifts::post64); + buf[pos+72] = (float) (intbuf[72] / interpolation_shifts::post64); + buf[pos+73] = (float) (intbuf[73] / interpolation_shifts::post64); + buf[pos+74] = (float) (intbuf[74] / interpolation_shifts::post64); + buf[pos+75] = (float) (intbuf[75] / interpolation_shifts::post64); + buf[pos+76] = (float) (intbuf[76] / interpolation_shifts::post64); + buf[pos+77] = (float) (intbuf[77] / interpolation_shifts::post64); + buf[pos+78] = (float) (intbuf[78] / interpolation_shifts::post64); + buf[pos+79] = (float) (intbuf[79] / interpolation_shifts::post64); + buf[pos+80] = (float) (intbuf[80] / interpolation_shifts::post64); + buf[pos+81] = (float) (intbuf[81] / interpolation_shifts::post64); + buf[pos+82] = (float) (intbuf[82] / interpolation_shifts::post64); + buf[pos+83] = (float) (intbuf[83] / interpolation_shifts::post64); + buf[pos+84] = (float) (intbuf[84] / interpolation_shifts::post64); + buf[pos+85] = (float) (intbuf[85] / interpolation_shifts::post64); + buf[pos+86] = (float) (intbuf[86] / interpolation_shifts::post64); + buf[pos+87] = (float) (intbuf[87] / interpolation_shifts::post64); + buf[pos+88] = (float) (intbuf[88] / interpolation_shifts::post64); + buf[pos+89] = (float) (intbuf[89] / interpolation_shifts::post64); + buf[pos+90] = (float) (intbuf[90] / interpolation_shifts::post64); + buf[pos+91] = (float) (intbuf[91] / interpolation_shifts::post64); + buf[pos+92] = (float) (intbuf[92] / interpolation_shifts::post64); + buf[pos+93] = (float) (intbuf[93] / interpolation_shifts::post64); + buf[pos+94] = (float) (intbuf[94] / interpolation_shifts::post64); + buf[pos+95] = (float) (intbuf[95] / interpolation_shifts::post64); + buf[pos+96] = (float) (intbuf[96] / interpolation_shifts::post64); + buf[pos+97] = (float) (intbuf[97] / interpolation_shifts::post64); + buf[pos+98] = (float) (intbuf[98] / interpolation_shifts::post64); + buf[pos+99] = (float) (intbuf[99] / interpolation_shifts::post64); + buf[pos+100] = (float) (intbuf[100] / interpolation_shifts::post64); + buf[pos+101] = (float) (intbuf[101] / interpolation_shifts::post64); + buf[pos+102] = (float) (intbuf[102] / interpolation_shifts::post64); + buf[pos+103] = (float) (intbuf[103] / interpolation_shifts::post64); + buf[pos+104] = (float) (intbuf[104] / interpolation_shifts::post64); + buf[pos+105] = (float) (intbuf[105] / interpolation_shifts::post64); + buf[pos+106] = (float) (intbuf[106] / interpolation_shifts::post64); + buf[pos+107] = (float) (intbuf[107] / interpolation_shifts::post64); + buf[pos+108] = (float) (intbuf[108] / interpolation_shifts::post64); + buf[pos+109] = (float) (intbuf[109] / interpolation_shifts::post64); + buf[pos+110] = (float) (intbuf[110] / interpolation_shifts::post64); + buf[pos+111] = (float) (intbuf[111] / interpolation_shifts::post64); + buf[pos+112] = (float) (intbuf[112] / interpolation_shifts::post64); + buf[pos+113] = (float) (intbuf[113] / interpolation_shifts::post64); + buf[pos+114] = (float) (intbuf[114] / interpolation_shifts::post64); + buf[pos+115] = (float) (intbuf[115] / interpolation_shifts::post64); + buf[pos+116] = (float) (intbuf[116] / interpolation_shifts::post64); + buf[pos+117] = (float) (intbuf[117] / interpolation_shifts::post64); + buf[pos+118] = (float) (intbuf[118] / interpolation_shifts::post64); + buf[pos+119] = (float) (intbuf[119] / interpolation_shifts::post64); + buf[pos+120] = (float) (intbuf[120] / interpolation_shifts::post64); + buf[pos+121] = (float) (intbuf[121] / interpolation_shifts::post64); + buf[pos+122] = (float) (intbuf[122] / interpolation_shifts::post64); + buf[pos+123] = (float) (intbuf[123] / interpolation_shifts::post64); + buf[pos+124] = (float) (intbuf[124] / interpolation_shifts::post64); + buf[pos+125] = (float) (intbuf[125] / interpolation_shifts::post64); + buf[pos+126] = (float) (intbuf[126] / interpolation_shifts::post64); + buf[pos+127] = (float) (intbuf[127] / interpolation_shifts::post64); ++(*it); } @@ -1298,7 +1316,7 @@ void InterpolatorsIF::interpolate64_inf(SampleVector::iterator* } for (int i = 0; i < 256; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post64; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post64); } } } @@ -1378,7 +1396,7 @@ void InterpolatorsIF::interpolate64_sup(SampleVector::iterator* } for (int i = 0; i < 256; i++) { - buf[pos+i] = intbuf[i] / interpolation_shifts::post64; + buf[pos+i] = (float) (intbuf[i] / interpolation_shifts::post64); } } } diff --git a/sdrbase/dsp/samplesourcefifo.cpp b/sdrbase/dsp/samplesourcefifo.cpp index edfd6044e..0c36b53bd 100644 --- a/sdrbase/dsp/samplesourcefifo.cpp +++ b/sdrbase/dsp/samplesourcefifo.cpp @@ -30,6 +30,7 @@ SampleSourceFifo::SampleSourceFifo(uint32_t size, QObject* parent) : SampleSourceFifo::SampleSourceFifo(const SampleSourceFifo& other) : QObject(other.parent()), + m_size(other.m_size), m_data(other.m_data) { init(); diff --git a/sdrbase/util/rtpsink.cpp b/sdrbase/util/rtpsink.cpp index d18a77af4..78702c552 100644 --- a/sdrbase/util/rtpsink.cpp +++ b/sdrbase/util/rtpsink.cpp @@ -343,8 +343,6 @@ unsigned int RTPSink::elemLength(PayloadType payloadType) return sizeof(int8_t); break; case PayloadL16Stereo: - return sizeof(int16_t); - break; case PayloadL16Mono: default: return sizeof(int16_t); diff --git a/sdrgui/soapygui/arginfogui.cpp b/sdrgui/soapygui/arginfogui.cpp index 8c8218135..93d3ea903 100644 --- a/sdrgui/soapygui/arginfogui.cpp +++ b/sdrgui/soapygui/arginfogui.cpp @@ -36,6 +36,15 @@ ArgInfoGUI::ArgInfoGUI(ArgInfoType type, ArgInfoValueType valueType, QWidget *pa ui->setupUi(this); QHBoxLayout *layout = ui->argLayout; + if ((m_valueType == ArgInfoValueInt) || (m_valueType == ArgInfoValueFloat)) + { + if (m_type == ArgInfoContinuous) { + ui->argEdit->setAlignment(Qt::AlignRight); + } else if (m_type == ArgInfoDiscrete) { + ui->argCombo->setLayoutDirection(Qt::RightToLeft); + } + } + if (m_type != ArgInfoBinary) { layout->removeWidget(ui->argCheck); @@ -53,15 +62,6 @@ ArgInfoGUI::ArgInfoGUI(ArgInfoType type, ArgInfoValueType valueType, QWidget *pa layout->removeWidget(ui->argCombo); delete ui->argCombo; } - - if ((m_valueType == ArgInfoValueInt) || (m_valueType == ArgInfoValueFloat)) - { - if (m_type == ArgInfoContinuous) { - ui->argEdit->setAlignment(Qt::AlignRight); - } else if (m_type == ArgInfoDiscrete) { - ui->argCombo->setLayoutDirection(Qt::RightToLeft); - } - } } ArgInfoGUI::~ArgInfoGUI()