From d59d2a237273e4ef12cc44fbe8d8a46ac9fa6ab6 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 18 Sep 2017 00:08:28 +0200 Subject: [PATCH] LimeSDR: use more meaningful names for messages to buddies --- devices/limesdr/devicelimesdrshared.cpp | 2 +- devices/limesdr/devicelimesdrshared.h | 8 ++++---- plugins/samplesink/limesdroutput/limesdroutput.cpp | 8 ++++---- plugins/samplesink/limesdroutput/limesdroutput.h | 8 ++++---- plugins/samplesink/limesdroutput/limesdroutputgui.cpp | 8 ++++---- plugins/samplesource/limesdrinput/limesdrinput.cpp | 8 ++++---- plugins/samplesource/limesdrinput/limesdrinput.h | 8 ++++---- plugins/samplesource/limesdrinput/limesdrinputgui.cpp | 8 ++++---- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/devices/limesdr/devicelimesdrshared.cpp b/devices/limesdr/devicelimesdrshared.cpp index 0dd63bbea..2fd5574b6 100644 --- a/devices/limesdr/devicelimesdrshared.cpp +++ b/devices/limesdr/devicelimesdrshared.cpp @@ -16,7 +16,7 @@ #include "devicelimesdrshared.h" -MESSAGE_CLASS_DEFINITION(DeviceLimeSDRShared::MsgCrossReportToGUI, Message) +MESSAGE_CLASS_DEFINITION(DeviceLimeSDRShared::MsgCrossReportToBuddy, Message) MESSAGE_CLASS_DEFINITION(DeviceLimeSDRShared::MsgReportDeviceInfo, Message) const float DeviceLimeSDRShared::m_sampleFifoLengthInSeconds = 0.25; diff --git a/devices/limesdr/devicelimesdrshared.h b/devices/limesdr/devicelimesdrshared.h index fd4f2bcd0..f211cd25b 100644 --- a/devices/limesdr/devicelimesdrshared.h +++ b/devices/limesdr/devicelimesdrshared.h @@ -27,21 +27,21 @@ class DeviceLimeSDRShared { public: - class MsgCrossReportToGUI : public Message { + class MsgCrossReportToBuddy : public Message { MESSAGE_CLASS_DECLARATION public: int getSampleRate() const { return m_sampleRate; } - static MsgCrossReportToGUI* create(int sampleRate) + static MsgCrossReportToBuddy* create(int sampleRate) { - return new MsgCrossReportToGUI(sampleRate); + return new MsgCrossReportToBuddy(sampleRate); } private: int m_sampleRate; - MsgCrossReportToGUI(int sampleRate) : + MsgCrossReportToBuddy(int sampleRate) : Message(), m_sampleRate(sampleRate) { } diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 0617f3500..04570b97f 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -32,7 +32,7 @@ MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgConfigureLimeSDR, Message) MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgGetStreamInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgGetDeviceInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgSetReferenceConfig, Message) -MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgReportLimeSDRToGUI, Message) +MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgReportLimeSDRToBuddy, Message) MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgReportStreamInfo, Message) @@ -920,7 +920,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo if ((*itSink)->getSampleSinkGUIMessageQueue()) { - MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( + MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create( m_settings.m_centerFrequency, m_settings.m_devSampleRate, m_settings.m_log2HardInterp); @@ -945,7 +945,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo if ((*itSource)->getSampleSourceGUIMessageQueue()) { - DeviceLimeSDRShared::MsgCrossReportToGUI *report = DeviceLimeSDRShared::MsgCrossReportToGUI::create(m_settings.m_devSampleRate); + DeviceLimeSDRShared::MsgCrossReportToBuddy *report = DeviceLimeSDRShared::MsgCrossReportToBuddy::create(m_settings.m_devSampleRate); (*itSource)->getSampleSourceGUIMessageQueue()->push(report); } } @@ -975,7 +975,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo if ((*itSink)->getSampleSinkGUIMessageQueue()) { - MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( + MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create( m_settings.m_centerFrequency, m_settings.m_devSampleRate, m_settings.m_log2HardInterp); diff --git a/plugins/samplesink/limesdroutput/limesdroutput.h b/plugins/samplesink/limesdroutput/limesdroutput.h index 67026bff2..7f66412f2 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.h +++ b/plugins/samplesink/limesdroutput/limesdroutput.h @@ -101,7 +101,7 @@ public: { } }; - class MsgReportLimeSDRToGUI : public Message { + class MsgReportLimeSDRToBuddy : public Message { MESSAGE_CLASS_DECLARATION public: @@ -109,9 +109,9 @@ public: int getSampleRate() const { return m_sampleRate; } uint32_t getLog2HardInterp() const { return m_log2HardInterp; } - static MsgReportLimeSDRToGUI* create(float centerFrequency, int sampleRate, uint32_t log2HardInterp) + static MsgReportLimeSDRToBuddy* create(float centerFrequency, int sampleRate, uint32_t log2HardInterp) { - return new MsgReportLimeSDRToGUI(centerFrequency, sampleRate, log2HardInterp); + return new MsgReportLimeSDRToBuddy(centerFrequency, sampleRate, log2HardInterp); } private: @@ -119,7 +119,7 @@ public: int m_sampleRate; uint32_t m_log2HardInterp; - MsgReportLimeSDRToGUI(float centerFrequency, int sampleRate, uint32_t log2HardInterp) : + MsgReportLimeSDRToBuddy(float centerFrequency, int sampleRate, uint32_t log2HardInterp) : Message(), m_centerFrequency(centerFrequency), m_sampleRate(sampleRate), diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index d05697572..1caa37a59 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -139,10 +139,10 @@ bool LimeSDROutputGUI::deserialize(const QByteArray& data) bool LimeSDROutputGUI::handleMessage(const Message& message) { - if (LimeSDROutput::MsgReportLimeSDRToGUI::match(message)) + if (LimeSDROutput::MsgReportLimeSDRToBuddy::match(message)) { qDebug("LimeSDROutputGUI::handleMessagesToGUI: message: %s", message.getIdentifier()); - LimeSDROutput::MsgReportLimeSDRToGUI& report = (LimeSDROutput::MsgReportLimeSDRToGUI&) message; + LimeSDROutput::MsgReportLimeSDRToBuddy& report = (LimeSDROutput::MsgReportLimeSDRToBuddy&) message; m_settings.m_centerFrequency = report.getCenterFrequency(); m_settings.m_devSampleRate = report.getSampleRate(); @@ -157,9 +157,9 @@ bool LimeSDROutputGUI::handleMessage(const Message& message) return true; } - else if (DeviceLimeSDRShared::MsgCrossReportToGUI::match(message)) + else if (DeviceLimeSDRShared::MsgCrossReportToBuddy::match(message)) { - DeviceLimeSDRShared::MsgCrossReportToGUI& report = (DeviceLimeSDRShared::MsgCrossReportToGUI&) message; + DeviceLimeSDRShared::MsgCrossReportToBuddy& report = (DeviceLimeSDRShared::MsgCrossReportToBuddy&) message; m_settings.m_devSampleRate = report.getSampleRate(); blockApplySettings(true); diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index 0682e6887..5d4c2b585 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -34,7 +34,7 @@ MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgConfigureLimeSDR, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetStreamInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetDeviceInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgSetReferenceConfig, Message) -MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportLimeSDRToGUI, Message) +MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportLimeSDRToBuddy, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgReportStreamInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgFileRecord, Message) @@ -1082,7 +1082,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc if ((*itSource)->getSampleSourceGUIMessageQueue()) { - MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( + MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create( m_settings.m_centerFrequency, m_settings.m_devSampleRate, m_settings.m_log2HardDecim); @@ -1107,7 +1107,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc if ((*itSink)->getSampleSinkGUIMessageQueue()) { - DeviceLimeSDRShared::MsgCrossReportToGUI *report = DeviceLimeSDRShared::MsgCrossReportToGUI::create(m_settings.m_devSampleRate); + DeviceLimeSDRShared::MsgCrossReportToBuddy *report = DeviceLimeSDRShared::MsgCrossReportToBuddy::create(m_settings.m_devSampleRate); (*itSink)->getSampleSinkGUIMessageQueue()->push(report); } } @@ -1136,7 +1136,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc if ((*itSource)->getSampleSourceGUIMessageQueue()) { - MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( + MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create( m_settings.m_centerFrequency, m_settings.m_devSampleRate, m_settings.m_log2HardDecim); diff --git a/plugins/samplesource/limesdrinput/limesdrinput.h b/plugins/samplesource/limesdrinput/limesdrinput.h index 3fc6c4987..ef6a133df 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.h +++ b/plugins/samplesource/limesdrinput/limesdrinput.h @@ -102,7 +102,7 @@ public: { } }; - class MsgReportLimeSDRToGUI : public Message { + class MsgReportLimeSDRToBuddy : public Message { MESSAGE_CLASS_DECLARATION public: @@ -110,9 +110,9 @@ public: int getSampleRate() const { return m_sampleRate; } uint32_t getLog2HardDecim() const { return m_log2HardDecim; } - static MsgReportLimeSDRToGUI* create(float centerFrequency, int sampleRate, uint32_t log2HardDecim) + static MsgReportLimeSDRToBuddy* create(float centerFrequency, int sampleRate, uint32_t log2HardDecim) { - return new MsgReportLimeSDRToGUI(centerFrequency, sampleRate, log2HardDecim); + return new MsgReportLimeSDRToBuddy(centerFrequency, sampleRate, log2HardDecim); } private: @@ -120,7 +120,7 @@ public: int m_sampleRate; uint32_t m_log2HardDecim; - MsgReportLimeSDRToGUI(float centerFrequency, int sampleRate, uint32_t log2HardDecim) : + MsgReportLimeSDRToBuddy(float centerFrequency, int sampleRate, uint32_t log2HardDecim) : Message(), m_centerFrequency(centerFrequency), m_sampleRate(sampleRate), diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 11b5db6ce..7bcf83245 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -139,9 +139,9 @@ bool LimeSDRInputGUI::deserialize(const QByteArray& data) bool LimeSDRInputGUI::handleMessage(const Message& message) { - if (LimeSDRInput::MsgReportLimeSDRToGUI::match(message)) + if (LimeSDRInput::MsgReportLimeSDRToBuddy::match(message)) { - LimeSDRInput::MsgReportLimeSDRToGUI& report = (LimeSDRInput::MsgReportLimeSDRToGUI&) message; + LimeSDRInput::MsgReportLimeSDRToBuddy& report = (LimeSDRInput::MsgReportLimeSDRToBuddy&) message; m_settings.m_centerFrequency = report.getCenterFrequency(); m_settings.m_devSampleRate = report.getSampleRate(); @@ -156,9 +156,9 @@ bool LimeSDRInputGUI::handleMessage(const Message& message) return true; } - else if (DeviceLimeSDRShared::MsgCrossReportToGUI::match(message)) + else if (DeviceLimeSDRShared::MsgCrossReportToBuddy::match(message)) { - DeviceLimeSDRShared::MsgCrossReportToGUI& report = (DeviceLimeSDRShared::MsgCrossReportToGUI&) message; + DeviceLimeSDRShared::MsgCrossReportToBuddy& report = (DeviceLimeSDRShared::MsgCrossReportToBuddy&) message; m_settings.m_devSampleRate = report.getSampleRate(); // TODO: remove from here should be done device to device blockApplySettings(true);