VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-10 10:33:29 -05:00
Code Issues Projects Releases Wiki Activity

LimeSDR: use more meaningful names for messages to buddies

Browse Source
This commit is contained in:
f4exb 2017-09-18 00:08:28 +02:00
parent a714e12387
commit d59d2a2372
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/limesdr/devicelimesdrshared.cpp
View File

@ -16,7 +16,7 @@
#include "devicelimesdrshared.h" #include "devicelimesdrshared.h"
MESSAGE_CLASS_DEFINITION(DeviceLimeSDRShared::MsgCrossReportToGUI, Message) MESSAGE_CLASS_DEFINITION(DeviceLimeSDRShared::MsgCrossReportToBuddy, Message)
MESSAGE_CLASS_DEFINITION(DeviceLimeSDRShared::MsgReportDeviceInfo, Message) MESSAGE_CLASS_DEFINITION(DeviceLimeSDRShared::MsgReportDeviceInfo, Message)
const float DeviceLimeSDRShared::m_sampleFifoLengthInSeconds = 0.25; const float DeviceLimeSDRShared::m_sampleFifoLengthInSeconds = 0.25;

8
devices/limesdr/devicelimesdrshared.h
View File

@ -27,21 +27,21 @@
class DeviceLimeSDRShared class DeviceLimeSDRShared
{ {
public: public:
class MsgCrossReportToGUI : public Message { class MsgCrossReportToBuddy : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
int getSampleRate() const { return m_sampleRate; } 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: private:
int m_sampleRate; int m_sampleRate;
MsgCrossReportToGUI(int sampleRate) : MsgCrossReportToBuddy(int sampleRate) :
Message(), Message(),
m_sampleRate(sampleRate) m_sampleRate(sampleRate)
{ } { }

8
plugins/samplesink/limesdroutput/limesdroutput.cpp
View File

@ -32,7 +32,7 @@ MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgConfigureLimeSDR, Message)
MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgGetStreamInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgGetStreamInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgGetDeviceInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgGetDeviceInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgSetReferenceConfig, 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) MESSAGE_CLASS_DEFINITION(LimeSDROutput::MsgReportStreamInfo, Message)
@ -920,7 +920,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo
if ((*itSink)->getSampleSinkGUIMessageQueue()) if ((*itSink)->getSampleSinkGUIMessageQueue())
{ {
MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create(
m_settings.m_centerFrequency, m_settings.m_centerFrequency,
m_settings.m_devSampleRate, m_settings.m_devSampleRate,
m_settings.m_log2HardInterp); m_settings.m_log2HardInterp);
@ -945,7 +945,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo
if ((*itSource)->getSampleSourceGUIMessageQueue()) 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); (*itSource)->getSampleSourceGUIMessageQueue()->push(report);
} }
} }
@ -975,7 +975,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo
if ((*itSink)->getSampleSinkGUIMessageQueue()) if ((*itSink)->getSampleSinkGUIMessageQueue())
{ {
MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create(
m_settings.m_centerFrequency, m_settings.m_centerFrequency,
m_settings.m_devSampleRate, m_settings.m_devSampleRate,
m_settings.m_log2HardInterp); m_settings.m_log2HardInterp);

8
plugins/samplesink/limesdroutput/limesdroutput.h
View File

@ -101,7 +101,7 @@ public:
{ } { }
}; };
class MsgReportLimeSDRToGUI : public Message { class MsgReportLimeSDRToBuddy : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
@ -109,9 +109,9 @@ public:
int getSampleRate() const { return m_sampleRate; } int getSampleRate() const { return m_sampleRate; }
uint32_t getLog2HardInterp() const { return m_log2HardInterp; } 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: private:
@ -119,7 +119,7 @@ public:
int m_sampleRate; int m_sampleRate;
uint32_t m_log2HardInterp; uint32_t m_log2HardInterp;
MsgReportLimeSDRToGUI(float centerFrequency, int sampleRate, uint32_t log2HardInterp) : MsgReportLimeSDRToBuddy(float centerFrequency, int sampleRate, uint32_t log2HardInterp) :
Message(), Message(),
m_centerFrequency(centerFrequency), m_centerFrequency(centerFrequency),
m_sampleRate(sampleRate), m_sampleRate(sampleRate),

8
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -139,10 +139,10 @@ bool LimeSDROutputGUI::deserialize(const QByteArray& data)
bool LimeSDROutputGUI::handleMessage(const Message& message) bool LimeSDROutputGUI::handleMessage(const Message& message)
{ {
if (LimeSDROutput::MsgReportLimeSDRToGUI::match(message)) if (LimeSDROutput::MsgReportLimeSDRToBuddy::match(message))
{ {
qDebug("LimeSDROutputGUI::handleMessagesToGUI: message: %s", message.getIdentifier()); 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_centerFrequency = report.getCenterFrequency();
m_settings.m_devSampleRate = report.getSampleRate(); m_settings.m_devSampleRate = report.getSampleRate();
@ -157,9 +157,9 @@ bool LimeSDROutputGUI::handleMessage(const Message& message)
return true; 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(); m_settings.m_devSampleRate = report.getSampleRate();
blockApplySettings(true); blockApplySettings(true);

8
plugins/samplesource/limesdrinput/limesdrinput.cpp
View File

@ -34,7 +34,7 @@ MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgConfigureLimeSDR, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetStreamInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetStreamInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetDeviceInfo, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgGetDeviceInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgSetReferenceConfig, 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::MsgReportStreamInfo, Message)
MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgFileRecord, Message) MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgFileRecord, Message)
@ -1082,7 +1082,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if ((*itSource)->getSampleSourceGUIMessageQueue()) if ((*itSource)->getSampleSourceGUIMessageQueue())
{ {
MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create(
m_settings.m_centerFrequency, m_settings.m_centerFrequency,
m_settings.m_devSampleRate, m_settings.m_devSampleRate,
m_settings.m_log2HardDecim); m_settings.m_log2HardDecim);
@ -1107,7 +1107,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if ((*itSink)->getSampleSinkGUIMessageQueue()) 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); (*itSink)->getSampleSinkGUIMessageQueue()->push(report);
} }
} }
@ -1136,7 +1136,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
if ((*itSource)->getSampleSourceGUIMessageQueue()) if ((*itSource)->getSampleSourceGUIMessageQueue())
{ {
MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( MsgReportLimeSDRToBuddy *report = MsgReportLimeSDRToBuddy::create(
m_settings.m_centerFrequency, m_settings.m_centerFrequency,
m_settings.m_devSampleRate, m_settings.m_devSampleRate,
m_settings.m_log2HardDecim); m_settings.m_log2HardDecim);

8
plugins/samplesource/limesdrinput/limesdrinput.h
View File

@ -102,7 +102,7 @@ public:
{ } { }
}; };
class MsgReportLimeSDRToGUI : public Message { class MsgReportLimeSDRToBuddy : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
@ -110,9 +110,9 @@ public:
int getSampleRate() const { return m_sampleRate; } int getSampleRate() const { return m_sampleRate; }
uint32_t getLog2HardDecim() const { return m_log2HardDecim; } 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: private:
@ -120,7 +120,7 @@ public:
int m_sampleRate; int m_sampleRate;
uint32_t m_log2HardDecim; uint32_t m_log2HardDecim;
MsgReportLimeSDRToGUI(float centerFrequency, int sampleRate, uint32_t log2HardDecim) : MsgReportLimeSDRToBuddy(float centerFrequency, int sampleRate, uint32_t log2HardDecim) :
Message(), Message(),
m_centerFrequency(centerFrequency), m_centerFrequency(centerFrequency),
m_sampleRate(sampleRate), m_sampleRate(sampleRate),

8
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
View File

@ -139,9 +139,9 @@ bool LimeSDRInputGUI::deserialize(const QByteArray& data)
bool LimeSDRInputGUI::handleMessage(const Message& message) 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_centerFrequency = report.getCenterFrequency();
m_settings.m_devSampleRate = report.getSampleRate(); m_settings.m_devSampleRate = report.getSampleRate();
@ -156,9 +156,9 @@ bool LimeSDRInputGUI::handleMessage(const Message& message)
return true; 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 m_settings.m_devSampleRate = report.getSampleRate(); // TODO: remove from here should be done device to device
blockApplySettings(true); blockApplySettings(true);