From 12735f26a9cd228feaef40f9325148f5656c8ecf Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 7 Dec 2019 11:47:52 +0100 Subject: [PATCH] Tx plugins: fixed VU meter handling --- plugins/channeltx/modam/ammodbaseband.cpp | 3 ++- plugins/channeltx/modam/ammodplugin.cpp | 2 +- plugins/channeltx/modam/ammodsource.h | 8 ++++---- plugins/channeltx/modatv/atvmodbaseband.cpp | 3 ++- plugins/channeltx/modatv/atvmodsource.h | 8 ++++---- plugins/channeltx/modfreedv/freedvmodbaseband.cpp | 3 ++- plugins/channeltx/modfreedv/freedvmodplugin.cpp | 2 +- plugins/channeltx/modfreedv/freedvmodsource.h | 8 ++++---- plugins/channeltx/modnfm/nfmmodbaseband.cpp | 3 ++- plugins/channeltx/modnfm/nfmmodplugin.cpp | 2 +- plugins/channeltx/modnfm/nfmmodsource.cpp | 2 +- plugins/channeltx/modnfm/nfmmodsource.h | 8 ++++---- plugins/channeltx/modssb/ssbmodbaseband.cpp | 3 ++- plugins/channeltx/modssb/ssbmodplugin.cpp | 2 +- plugins/channeltx/modssb/ssbmodsource.h | 8 ++++---- plugins/channeltx/modwfm/wfmmodbaseband.cpp | 3 ++- plugins/channeltx/modwfm/wfmmodplugin.cpp | 2 +- plugins/channeltx/modwfm/wfmmodsource.h | 8 ++++---- plugins/channeltx/udpsource/udpsourcebaseband.cpp | 3 ++- plugins/channeltx/udpsource/udpsourceplugin.cpp | 2 +- plugins/channeltx/udpsource/udpsourcesource.h | 8 ++++---- 21 files changed, 49 insertions(+), 42 deletions(-) diff --git a/plugins/channeltx/modam/ammodbaseband.cpp b/plugins/channeltx/modam/ammodbaseband.cpp index 0f59a7eec..48afd1bef 100644 --- a/plugins/channeltx/modam/ammodbaseband.cpp +++ b/plugins/channeltx/modam/ammodbaseband.cpp @@ -97,7 +97,8 @@ void AMModBaseband::handleData() unsigned int ipart1end; unsigned int ipart2begin; unsigned int ipart2end; - Real rmsLevel, peakLevel, numSamples; + qreal rmsLevel, peakLevel; + int numSamples; unsigned int remainder = m_sampleFifo.remainder(); diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index e7676c0aa..7d1219cb0 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor AMModPlugin::m_pluginDescriptor = { QString("AM Modulator"), - QString("4.12.1"), + QString("4.12.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modam/ammodsource.h b/plugins/channeltx/modam/ammodsource.h index bf0f5472d..ca2f72106 100644 --- a/plugins/channeltx/modam/ammodsource.h +++ b/plugins/channeltx/modam/ammodsource.h @@ -52,10 +52,10 @@ public: unsigned int getFeedbackAudioSampleRate() const { return m_feedbackAudioSampleRate; } CWKeyer& getCWKeyer() { return m_cwKeyer; } double getMagSq() const { return m_magsq; } - void getLevels(Real& rmsLevel, Real& peakLevel, Real& numSamples) const + void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const { rmsLevel = m_rmsLevel; - peakLevel = m_peakLevel; + peakLevel = m_peakLevelOut; numSamples = m_levelNbSamples; } void applySettings(const AMModSettings& settings, bool force = false); @@ -94,8 +94,8 @@ private: AudioFifo m_feedbackAudioFifo; quint32 m_levelCalcCount; - Real m_rmsLevel; - Real m_peakLevelOut; + qreal m_rmsLevel; + qreal m_peakLevelOut; Real m_peakLevel; Real m_levelSum; diff --git a/plugins/channeltx/modatv/atvmodbaseband.cpp b/plugins/channeltx/modatv/atvmodbaseband.cpp index 97ac56e05..fff64b1a6 100644 --- a/plugins/channeltx/modatv/atvmodbaseband.cpp +++ b/plugins/channeltx/modatv/atvmodbaseband.cpp @@ -96,7 +96,8 @@ void ATVModBaseband::handleData() unsigned int ipart1end; unsigned int ipart2begin; unsigned int ipart2end; - Real rmsLevel, peakLevel, numSamples; + qreal rmsLevel, peakLevel; + int numSamples; unsigned int remainder = m_sampleFifo.remainder(); diff --git a/plugins/channeltx/modatv/atvmodsource.h b/plugins/channeltx/modatv/atvmodsource.h index f575ebf1d..909cd2512 100644 --- a/plugins/channeltx/modatv/atvmodsource.h +++ b/plugins/channeltx/modatv/atvmodsource.h @@ -55,10 +55,10 @@ public: void getCameraNumbers(std::vector& numbers); void setMessageQueueToGUI(MessageQueue *messageQueue) { m_messageQueueToGUI = messageQueue; } - void getLevels(Real& rmsLevel, Real& peakLevel, Real& numSamples) const + void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const { rmsLevel = m_rmsLevel; - peakLevel = m_peakLevel; + peakLevel = m_peakLevelOut; numSamples = m_levelNbSamples; } @@ -172,8 +172,8 @@ private: MovingAverageUtil m_movingAverage; quint32 m_levelCalcCount; - Real m_rmsLevel; - Real m_peakLevelOut; + qreal m_rmsLevel; + qreal m_peakLevelOut; Real m_peakLevel; Real m_levelSum; diff --git a/plugins/channeltx/modfreedv/freedvmodbaseband.cpp b/plugins/channeltx/modfreedv/freedvmodbaseband.cpp index 7f804d910..9135a13da 100644 --- a/plugins/channeltx/modfreedv/freedvmodbaseband.cpp +++ b/plugins/channeltx/modfreedv/freedvmodbaseband.cpp @@ -93,7 +93,8 @@ void FreeDVModBaseband::handleData() unsigned int ipart1end; unsigned int ipart2begin; unsigned int ipart2end; - Real rmsLevel, peakLevel, numSamples; + qreal rmsLevel, peakLevel; + int numSamples; unsigned int remainder = m_sampleFifo.remainder(); diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.cpp b/plugins/channeltx/modfreedv/freedvmodplugin.cpp index 10e5bf748..dbcbc57f2 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.cpp +++ b/plugins/channeltx/modfreedv/freedvmodplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor FreeDVModPlugin::m_pluginDescriptor = { QString("FreeDV Modulator"), - QString("4.12.1"), + QString("4.12.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modfreedv/freedvmodsource.h b/plugins/channeltx/modfreedv/freedvmodsource.h index eedaa6492..f381180e0 100644 --- a/plugins/channeltx/modfreedv/freedvmodsource.h +++ b/plugins/channeltx/modfreedv/freedvmodsource.h @@ -52,10 +52,10 @@ public: void applyAudioSampleRate(unsigned int sampleRate); CWKeyer& getCWKeyer() { return m_cwKeyer; } double getMagSq() const { return m_magsq; } - void getLevels(Real& rmsLevel, Real& peakLevel, Real& numSamples) const + void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const { rmsLevel = m_rmsLevel; - peakLevel = m_peakLevel; + peakLevel = m_peakLevelOut; numSamples = m_levelNbSamples; } unsigned int getAudioSampleRate() const { return m_audioSampleRate; } @@ -106,8 +106,8 @@ private: AudioFifo m_audioFifo; quint32 m_levelCalcCount; - Real m_rmsLevel; - Real m_peakLevelOut; + qreal m_rmsLevel; + qreal m_peakLevelOut; Real m_peakLevel; Real m_levelSum; diff --git a/plugins/channeltx/modnfm/nfmmodbaseband.cpp b/plugins/channeltx/modnfm/nfmmodbaseband.cpp index 0717e91f5..c4c7b999e 100644 --- a/plugins/channeltx/modnfm/nfmmodbaseband.cpp +++ b/plugins/channeltx/modnfm/nfmmodbaseband.cpp @@ -97,7 +97,8 @@ void NFMModBaseband::handleData() unsigned int ipart1end; unsigned int ipart2begin; unsigned int ipart2end; - Real rmsLevel, peakLevel, numSamples; + qreal rmsLevel, peakLevel; + int numSamples; unsigned int remainder = m_sampleFifo.remainder(); diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index 3f618f85e..9fd1eb1d2 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor NFMModPlugin::m_pluginDescriptor = { QString("NFM Modulator"), - QString("4.12.1"), + QString("4.12.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modnfm/nfmmodsource.cpp b/plugins/channeltx/modnfm/nfmmodsource.cpp index 67f4bba69..29d031487 100644 --- a/plugins/channeltx/modnfm/nfmmodsource.cpp +++ b/plugins/channeltx/modnfm/nfmmodsource.cpp @@ -274,7 +274,7 @@ void NFMModSource::calculateLevel(Real& sample) } else { - qreal rmsLevel = sqrt(m_levelSum / m_levelNbSamples); + m_rmsLevel = sqrt(m_levelSum / m_levelNbSamples); m_peakLevelOut = m_peakLevel; m_peakLevel = 0.0f; m_levelSum = 0.0f; diff --git a/plugins/channeltx/modnfm/nfmmodsource.h b/plugins/channeltx/modnfm/nfmmodsource.h index fa5a252d5..929859c11 100644 --- a/plugins/channeltx/modnfm/nfmmodsource.h +++ b/plugins/channeltx/modnfm/nfmmodsource.h @@ -55,10 +55,10 @@ public: unsigned int getFeedbackAudioSampleRate() const { return m_feedbackAudioSampleRate; } CWKeyer& getCWKeyer() { return m_cwKeyer; } double getMagSq() const { return m_magsq; } - void getLevels(Real& rmsLevel, Real& peakLevel, Real& numSamples) const + void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const { rmsLevel = m_rmsLevel; - peakLevel = m_peakLevel; + peakLevel = m_peakLevelOut; numSamples = m_levelNbSamples; } void applySettings(const NFMModSettings& settings, bool force = false); @@ -103,8 +103,8 @@ private: AudioFifo m_feedbackAudioFifo; quint32 m_levelCalcCount; - Real m_rmsLevel; - Real m_peakLevelOut; + qreal m_rmsLevel; + qreal m_peakLevelOut; Real m_peakLevel; Real m_levelSum; diff --git a/plugins/channeltx/modssb/ssbmodbaseband.cpp b/plugins/channeltx/modssb/ssbmodbaseband.cpp index c7c1d9907..973ae77f7 100644 --- a/plugins/channeltx/modssb/ssbmodbaseband.cpp +++ b/plugins/channeltx/modssb/ssbmodbaseband.cpp @@ -97,7 +97,8 @@ void SSBModBaseband::handleData() unsigned int ipart1end; unsigned int ipart2begin; unsigned int ipart2end; - Real rmsLevel, peakLevel, numSamples; + qreal rmsLevel, peakLevel; + int numSamples; unsigned int remainder = m_sampleFifo.remainder(); diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index 51c46f45e..590bcfb5c 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor SSBModPlugin::m_pluginDescriptor = { QString("SSB Modulator"), - QString("4.12.1"), + QString("4.12.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modssb/ssbmodsource.h b/plugins/channeltx/modssb/ssbmodsource.h index 2146e7b71..8697cc3bd 100644 --- a/plugins/channeltx/modssb/ssbmodsource.h +++ b/plugins/channeltx/modssb/ssbmodsource.h @@ -55,10 +55,10 @@ public: unsigned int getFeedbackAudioSampleRate() const { return m_feedbackAudioSampleRate; } CWKeyer& getCWKeyer() { return m_cwKeyer; } double getMagSq() const { return m_magsq; } - void getLevels(Real& rmsLevel, Real& peakLevel, Real& numSamples) const + void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const { rmsLevel = m_rmsLevel; - peakLevel = m_peakLevel; + peakLevel = m_peakLevelOut; numSamples = m_levelNbSamples; } void applySettings(const SSBModSettings& settings, bool force = false); @@ -113,8 +113,8 @@ private: AudioFifo m_feedbackAudioFifo; quint32 m_levelCalcCount; - Real m_rmsLevel; - Real m_peakLevelOut; + qreal m_rmsLevel; + qreal m_peakLevelOut; Real m_peakLevel; Real m_levelSum; diff --git a/plugins/channeltx/modwfm/wfmmodbaseband.cpp b/plugins/channeltx/modwfm/wfmmodbaseband.cpp index 0115d1999..bd07da7bb 100644 --- a/plugins/channeltx/modwfm/wfmmodbaseband.cpp +++ b/plugins/channeltx/modwfm/wfmmodbaseband.cpp @@ -93,7 +93,8 @@ void WFMModBaseband::handleData() unsigned int ipart1end; unsigned int ipart2begin; unsigned int ipart2end; - Real rmsLevel, peakLevel, numSamples; + qreal rmsLevel, peakLevel; + int numSamples; unsigned int remainder = m_sampleFifo.remainder(); diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index c5ad1b1ca..09cfd4b10 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor WFMModPlugin::m_pluginDescriptor = { QString("WFM Modulator"), - QString("4.12.1"), + QString("4.12.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modwfm/wfmmodsource.h b/plugins/channeltx/modwfm/wfmmodsource.h index fa6e978ce..16fa7859b 100644 --- a/plugins/channeltx/modwfm/wfmmodsource.h +++ b/plugins/channeltx/modwfm/wfmmodsource.h @@ -51,10 +51,10 @@ public: unsigned int getAudioSampleRate() const { return m_audioSampleRate; } CWKeyer& getCWKeyer() { return m_cwKeyer; } double getMagSq() const { return m_magsq; } - void getLevels(Real& rmsLevel, Real& peakLevel, Real& numSamples) const + void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const { rmsLevel = m_rmsLevel; - peakLevel = m_peakLevel; + peakLevel = m_peakLevelOut; numSamples = m_levelNbSamples; } void applySettings(const WFMModSettings& settings, bool force = false); @@ -89,8 +89,8 @@ private: AudioFifo m_audioFifo; quint32 m_levelCalcCount; - Real m_rmsLevel; - Real m_peakLevelOut; + qreal m_rmsLevel; + qreal m_peakLevelOut; Real m_peakLevel; Real m_levelSum; diff --git a/plugins/channeltx/udpsource/udpsourcebaseband.cpp b/plugins/channeltx/udpsource/udpsourcebaseband.cpp index 4f798aa5b..07e3b57e9 100644 --- a/plugins/channeltx/udpsource/udpsourcebaseband.cpp +++ b/plugins/channeltx/udpsource/udpsourcebaseband.cpp @@ -94,7 +94,8 @@ void UDPSourceBaseband::handleData() unsigned int ipart1end; unsigned int ipart2begin; unsigned int ipart2end; - Real rmsLevel, peakLevel, numSamples; + qreal rmsLevel, peakLevel; + int numSamples; unsigned int remainder = m_sampleFifo.remainder(); diff --git a/plugins/channeltx/udpsource/udpsourceplugin.cpp b/plugins/channeltx/udpsource/udpsourceplugin.cpp index bd438c4fc..099055b29 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.cpp +++ b/plugins/channeltx/udpsource/udpsourceplugin.cpp @@ -30,7 +30,7 @@ const PluginDescriptor UDPSourcePlugin::m_pluginDescriptor = { QString("UDP Channel Source"), - QString("4.12.1"), + QString("4.12.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/udpsource/udpsourcesource.h b/plugins/channeltx/udpsource/udpsourcesource.h index b3bd96a80..8f634c007 100644 --- a/plugins/channeltx/udpsource/udpsourcesource.h +++ b/plugins/channeltx/udpsource/udpsourcesource.h @@ -55,10 +55,10 @@ public: void applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force = false); void applySettings(const UDPSourceSettings& settings, bool force = false); - void getLevels(Real& rmsLevel, Real& peakLevel, Real& numSamples) const + void getLevels(qreal& rmsLevel, qreal& peakLevel, int& numSamples) const { rmsLevel = m_rmsLevel; - peakLevel = m_peakLevel; + peakLevel = m_peakLevelOut; numSamples = m_levelNbSamples; } @@ -96,8 +96,8 @@ private: int m_sampleRateAvgCounter; int m_levelCalcCount; - Real m_rmsLevel; - Real m_peakLevelOut; + qreal m_rmsLevel; + qreal m_peakLevelOut; Real m_peakLevel; double m_levelSum; int m_levelNbSamples;