From 636ede56cf764d6fb7b303f0caee6d0b3d7a5a6f Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 6 Nov 2017 01:02:20 +0100 Subject: [PATCH] Renamed the moving average of util section to avoid confusion --- .../samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h | 6 +++--- sdrbase/util/movingaverage.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h index ab0ea8f11..dab6d5aa3 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h @@ -197,9 +197,9 @@ private: int m_minOriginalBlocks; //!< (stats) minimum number of original blocks received since last poll int m_curNbRecovery; //!< (stats) instantaneous number of recovery blocks used int m_maxNbRecovery; //!< (stats) maximum number of recovery blocks used since last poll - MovingAverage m_avgNbBlocks; //!< (stats) average number of blocks received - MovingAverage m_avgOrigBlocks; //!< (stats) average number of original blocks received - MovingAverage m_avgNbRecovery; //!< (stats) average number of recovery blocks used + MovingAverageUtil m_avgNbBlocks; //!< (stats) average number of blocks received + MovingAverageUtil m_avgOrigBlocks; //!< (stats) average number of original blocks received + MovingAverageUtil m_avgNbRecovery; //!< (stats) average number of recovery blocks used bool m_framesDecoded; //!< [stats] true if all frames were decoded since last poll int m_readIndex; //!< current byte read index in frames buffer int m_wrDeltaEstimate; //!< Sampled estimate of write to read indexes difference diff --git a/sdrbase/util/movingaverage.h b/sdrbase/util/movingaverage.h index 93dcfba8a..919a29b38 100644 --- a/sdrbase/util/movingaverage.h +++ b/sdrbase/util/movingaverage.h @@ -25,10 +25,10 @@ #include template -class MovingAverage +class MovingAverageUtil { public: - MovingAverage() + MovingAverageUtil() : m_num_samples(0), m_total(0) { }