VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-27 15:26:33 -04:00
Code Issues Projects Releases Wiki Activity

Device source API: renamed input and output message queues getters to more meaningful names

Browse Source
This commit is contained in:
f4exb 2017-09-13 23:40:06 +02:00
parent f30b049546
commit 24442c18a3
24 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,7 +478,7 @@ bool LimeSDROutput::handleMessage(const Message& message)
for (; itSource != sourceBuddies.end(); ++itSource) for (; itSource != sourceBuddies.end(); ++itSource)
{ {
DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp); DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp);
(*itSource)->getDeviceOutputMessageQueue()->push(report); (*itSource)->getDeviceEngineOutputMessageQueue()->push(report);
} }
// send to sink buddies // send to sink buddies
@ -918,9 +918,9 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo
DSPSignalNotification *notif = new DSPSignalNotification( DSPSignalNotification *notif = new DSPSignalNotification(
m_settings.m_devSampleRate/(1<<buddyLog2SoftDecim), m_settings.m_devSampleRate/(1<<buddyLog2SoftDecim),
buddyCenterFreq + buddyNCOFreq); buddyCenterFreq + buddyNCOFreq);
(*itSource)->getDeviceInputMessageQueue()->push(notif); (*itSource)->getDeviceEngineInputMessageQueue()->push(notif);
DeviceLimeSDRShared::MsgCrossReportToGUI *report = DeviceLimeSDRShared::MsgCrossReportToGUI::create(m_settings.m_devSampleRate); DeviceLimeSDRShared::MsgCrossReportToGUI *report = DeviceLimeSDRShared::MsgCrossReportToGUI::create(m_settings.m_devSampleRate);
(*itSource)->getDeviceOutputMessageQueue()->push(report); (*itSource)->getDeviceEngineOutputMessageQueue()->push(report);
} }
} }
else if (forwardChangeTxDSP) else if (forwardChangeTxDSP)

4
plugins/samplesource/airspy/airspygui.cpp
View File

@ -54,7 +54,7 @@ AirspyGui::AirspyGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_rates = ((AirspyInput*) m_sampleSource)->getSampleRates(); m_rates = ((AirspyInput*) m_sampleSource)->getSampleRates();
displaySampleRates(); displaySampleRates();
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
} }
AirspyGui::~AirspyGui() AirspyGui::~AirspyGui()
@ -134,7 +134,7 @@ void AirspyGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("AirspyGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("AirspyGui::handleDSPMessages: message: %s", message->getIdentifier());

2
plugins/samplesource/airspy/airspyinput.cpp
View File

@ -501,7 +501,7 @@ bool AirspyInput::applySettings(const AirspySettings& settings, bool force)
int sampleRate = devSampleRate/(1<<m_settings.m_log2Decim); int sampleRate = devSampleRate/(1<<m_settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
return true; return true;

2
plugins/samplesource/bladerfinput/bladerfinput.cpp
View File

@ -510,7 +510,7 @@ bool BladerfInput::applySettings(const BladeRFInputSettings& settings, bool forc
int sampleRate = m_settings.m_devSampleRate/(1<<m_settings.m_log2Decim); int sampleRate = m_settings.m_devSampleRate/(1<<m_settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
qDebug() << "BladerfInput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz" qDebug() << "BladerfInput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz"

4
plugins/samplesource/bladerfinput/bladerfinputgui.cpp
View File

@ -60,7 +60,7 @@ BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
} }
BladerfInputGui::~BladerfInputGui() BladerfInputGui::~BladerfInputGui()
@ -129,7 +129,7 @@ void BladerfInputGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("BladerfGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("BladerfGui::handleDSPMessages: message: %s", message->getIdentifier());

4
plugins/samplesource/fcdpro/fcdprogui.cpp
View File

@ -143,7 +143,7 @@ FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
} }
FCDProGui::~FCDProGui() FCDProGui::~FCDProGui()
@ -214,7 +214,7 @@ void FCDProGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("FCDProGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("FCDProGui::handleDSPMessages: message: %s", message->getIdentifier());

2
plugins/samplesource/fcdpro/fcdproinput.cpp
View File

@ -395,7 +395,7 @@ void FCDProInput::applySettings(const FCDProSettings& settings, bool force)
{ {
DSPSignalNotification *notif = new DSPSignalNotification(fcd_traits<Pro>::sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(fcd_traits<Pro>::sampleRate, m_settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
} }

4
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
View File

@ -61,7 +61,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
} }
FCDProPlusGui::~FCDProPlusGui() FCDProPlusGui::~FCDProPlusGui()
@ -132,7 +132,7 @@ void FCDProPlusGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("RTLSDRGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("RTLSDRGui::handleDSPMessages: message: %s", message->getIdentifier());

2
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
View File

@ -289,7 +289,7 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for
{ {
DSPSignalNotification *notif = new DSPSignalNotification(fcd_traits<ProPlus>::sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(fcd_traits<ProPlus>::sampleRate, m_settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
} }

4
plugins/samplesource/filesource/filesourcegui.cpp
View File

@ -70,7 +70,7 @@ FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
m_deviceAPI->setSource(m_sampleSource); m_deviceAPI->setSource(m_sampleSource);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
} }
FileSourceGui::~FileSourceGui() FileSourceGui::~FileSourceGui()
@ -133,7 +133,7 @@ void FileSourceGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("FileSourceGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("FileSourceGui::handleDSPMessages: message: %s", message->getIdentifier());

2
plugins/samplesource/hackrfinput/hackrfinput.cpp
View File

@ -464,7 +464,7 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
int sampleRate = devSampleRate/(1<<m_settings.m_log2Decim); int sampleRate = devSampleRate/(1<<m_settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
m_settings.m_linkTxFrequency = settings.m_linkTxFrequency; m_settings.m_linkTxFrequency = settings.m_linkTxFrequency;

4
plugins/samplesource/hackrfinput/hackrfinputgui.cpp
View File

@ -57,7 +57,7 @@ HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
displayBandwidths(); displayBandwidths();
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
sendSettings(); sendSettings();
} }
@ -140,7 +140,7 @@ void HackRFInputGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("HackRFGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("HackRFGui::handleDSPMessages: message: %s", message->getIdentifier());

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

@ -432,7 +432,7 @@ bool LimeSDRInput::handleMessage(const Message& message)
status.sampleRate, status.sampleRate,
status.linkRate, status.linkRate,
status.timestamp); status.timestamp);
m_deviceAPI->getDeviceOutputMessageQueue()->push(report); m_deviceAPI->getDeviceEngineOutputMessageQueue()->push(report);
} }
else else
{ {
@ -447,7 +447,7 @@ bool LimeSDRInput::handleMessage(const Message& message)
0, // status.sampleRate, 0, // status.sampleRate,
0, // status.linkRate, 0, // status.linkRate,
0); // status.timestamp); 0); // status.timestamp);
m_deviceAPI->getDeviceOutputMessageQueue()->push(report); m_deviceAPI->getDeviceEngineOutputMessageQueue()->push(report);
} }
return true; return true;
@ -467,7 +467,7 @@ bool LimeSDRInput::handleMessage(const Message& message)
// send to oneself // send to oneself
DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp); DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp);
m_deviceAPI->getDeviceOutputMessageQueue()->push(report); m_deviceAPI->getDeviceEngineOutputMessageQueue()->push(report);
// send to source buddies // send to source buddies
const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies(); const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies();
@ -476,7 +476,7 @@ bool LimeSDRInput::handleMessage(const Message& message)
for (; itSource != sourceBuddies.end(); ++itSource) for (; itSource != sourceBuddies.end(); ++itSource)
{ {
DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp); DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp);
(*itSource)->getDeviceOutputMessageQueue()->push(report); (*itSource)->getDeviceEngineOutputMessageQueue()->push(report);
} }
// send to sink buddies // send to sink buddies
@ -1045,7 +1045,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
DSPSignalNotification *notif = new DSPSignalNotification( DSPSignalNotification *notif = new DSPSignalNotification(
m_settings.m_devSampleRate/(1<<m_settings.m_log2SoftDecim), m_settings.m_devSampleRate/(1<<m_settings.m_log2SoftDecim),
m_settings.m_centerFrequency + ncoShift); m_settings.m_centerFrequency + ncoShift);
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
// send to source buddies // send to source buddies
const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies(); const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies();
@ -1059,12 +1059,12 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
DSPSignalNotification *notif = new DSPSignalNotification( DSPSignalNotification *notif = new DSPSignalNotification(
m_settings.m_devSampleRate/(1<<buddyLog2Decim), m_settings.m_devSampleRate/(1<<buddyLog2Decim),
m_settings.m_centerFrequency + buddyNCOFreq); m_settings.m_centerFrequency + buddyNCOFreq);
(*itSource)->getDeviceInputMessageQueue()->push(notif); (*itSource)->getDeviceEngineInputMessageQueue()->push(notif);
MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::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);
(*itSource)->getDeviceOutputMessageQueue()->push(report); (*itSource)->getDeviceEngineOutputMessageQueue()->push(report);
} }
// send to sink buddies // send to sink buddies
@ -1094,7 +1094,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
// send to self first // send to self first
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + ncoShift); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + ncoShift);
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
// send to source buddies // send to source buddies
const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies(); const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies();
@ -1105,12 +1105,12 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
DeviceLimeSDRShared *buddySharedPtr = (DeviceLimeSDRShared *) (*itSource)->getBuddySharedPtr(); DeviceLimeSDRShared *buddySharedPtr = (DeviceLimeSDRShared *) (*itSource)->getBuddySharedPtr();
int buddyNCOFreq = buddySharedPtr->m_ncoFrequency; int buddyNCOFreq = buddySharedPtr->m_ncoFrequency;
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + buddyNCOFreq); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + buddyNCOFreq);
(*itSource)->getDeviceInputMessageQueue()->push(notif); (*itSource)->getDeviceEngineInputMessageQueue()->push(notif);
MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::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);
(*itSource)->getDeviceOutputMessageQueue()->push(report); (*itSource)->getDeviceEngineOutputMessageQueue()->push(report);
} }
} }
else if (forwardChangeOwnDSP) else if (forwardChangeOwnDSP)
@ -1121,7 +1121,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc
int ncoShift = m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0; int ncoShift = m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0;
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + ncoShift); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + ncoShift);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
qDebug() << "LimeSDRInput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz" qDebug() << "LimeSDRInput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz"

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

@ -76,7 +76,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleMessagesToGUI()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleMessagesToGUI()), Qt::QueuedConnection);
} }
LimeSDRInputGUI::~LimeSDRInputGUI() LimeSDRInputGUI::~LimeSDRInputGUI()
@ -148,7 +148,7 @@ void LimeSDRInputGUI::handleMessagesToGUI()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
if (DSPSignalNotification::match(*message)) if (DSPSignalNotification::match(*message))
{ {

2
plugins/samplesource/plutosdrinput/plutosdrinput.cpp
View File

@ -443,7 +443,7 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo
int sampleRate = m_settings.m_devSampleRate/(1<<m_settings.m_log2Decim); int sampleRate = m_settings.m_devSampleRate/(1<<m_settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
return true; return true;

4
plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
View File

@ -67,7 +67,7 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent)
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
} }
PlutoSDRInputGui::~PlutoSDRInputGui() PlutoSDRInputGui::~PlutoSDRInputGui()
@ -390,7 +390,7 @@ void PlutoSDRInputGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
if (DSPSignalNotification::match(*message)) if (DSPSignalNotification::match(*message))
{ {

4
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
View File

@ -53,7 +53,7 @@ RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
queryDeviceReport(); // will reply with MsgReportRTLSDR to report gain list queryDeviceReport(); // will reply with MsgReportRTLSDR to report gain list
} }
@ -150,7 +150,7 @@ void RTLSDRGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("RTLSDRGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("RTLSDRGui::handleDSPMessages: message: %s", message->getIdentifier());

2
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -422,7 +422,7 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force)
int sampleRate = m_settings.m_devSampleRate/(1<<m_settings.m_log2Decim); int sampleRate = m_settings.m_devSampleRate/(1<<m_settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
return true; return true;

4
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
View File

@ -103,7 +103,7 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, QWidget* pare
displaySettings(); displaySettings();
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
m_eventsTime.start(); m_eventsTime.start();
displayEventCounts(); displayEventCounts();
@ -254,7 +254,7 @@ void SDRdaemonSourceGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("SDRdaemonGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("SDRdaemonGui::handleDSPMessages: message: %s", message->getIdentifier());

4
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp
View File

@ -94,7 +94,7 @@ void SDRdaemonSourceUDPHandler::start()
// Need to notify the DSP engine to actually start // Need to notify the DSP engine to actually start
DSPSignalNotification *notif = new DSPSignalNotification(m_samplerate, m_centerFrequency * 1000); // Frequency in Hz for the DSP engine DSPSignalNotification *notif = new DSPSignalNotification(m_samplerate, m_centerFrequency * 1000); // Frequency in Hz for the DSP engine
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
m_elapsedTimer.start(); m_elapsedTimer.start();
} }
@ -173,7 +173,7 @@ void SDRdaemonSourceUDPHandler::processData()
if (change) if (change)
{ {
DSPSignalNotification *notif = new DSPSignalNotification(m_samplerate, m_centerFrequency * 1000); // Frequency in Hz for the DSP engine DSPSignalNotification *notif = new DSPSignalNotification(m_samplerate, m_centerFrequency * 1000); // Frequency in Hz for the DSP engine
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
SDRdaemonSourceInput::MsgReportSDRdaemonSourceStreamData *report = SDRdaemonSourceInput::MsgReportSDRdaemonSourceStreamData::create( SDRdaemonSourceInput::MsgReportSDRdaemonSourceStreamData *report = SDRdaemonSourceInput::MsgReportSDRdaemonSourceStreamData::create(
m_samplerate, m_samplerate,
m_centerFrequency * 1000, // Frequency in Hz for the GUI m_centerFrequency * 1000, // Frequency in Hz for the GUI

4
plugins/samplesource/sdrplay/sdrplaygui.cpp
View File

@ -71,7 +71,7 @@ SDRPlayGui::SDRPlayGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
} }
SDRPlayGui::~SDRPlayGui() SDRPlayGui::~SDRPlayGui()
@ -172,7 +172,7 @@ void SDRPlayGui::handleDSPMessages()
{ {
Message* message; Message* message;
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
{ {
qDebug("SDRPlayGui::handleDSPMessages: message: %s", message->getIdentifier()); qDebug("SDRPlayGui::handleDSPMessages: message: %s", message->getIdentifier());

2
plugins/samplesource/sdrplay/sdrplayinput.cpp
View File

@ -531,7 +531,7 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool forwardCh
int sampleRate = getSampleRate(); int sampleRate = getSampleRate();
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
return true; return true;

4
sdrbase/device/devicesourceapi.cpp
View File

@ -105,12 +105,12 @@ uint DeviceSourceAPI::getDeviceUID() const
return m_deviceSourceEngine->getUID(); return m_deviceSourceEngine->getUID();
} }
MessageQueue *DeviceSourceAPI::getDeviceInputMessageQueue() MessageQueue *DeviceSourceAPI::getDeviceEngineInputMessageQueue()
{ {
return m_deviceSourceEngine->getInputMessageQueue(); return m_deviceSourceEngine->getInputMessageQueue();
} }
MessageQueue *DeviceSourceAPI::getDeviceOutputMessageQueue() MessageQueue *DeviceSourceAPI::getDeviceEngineOutputMessageQueue()
{ {
return m_deviceSourceEngine->getOutputMessageQueue(); return m_deviceSourceEngine->getOutputMessageQueue();
} }

4
sdrbase/device/devicesourceapi.h
View File

@ -56,8 +56,8 @@ public:
DSPDeviceSourceEngine::State state() const; //!< device engine state DSPDeviceSourceEngine::State state() const; //!< device engine state
QString errorMessage(); //!< Return the current device engine error message QString errorMessage(); //!< Return the current device engine error message
uint getDeviceUID() const; //!< Return the current device engine unique ID uint getDeviceUID() const; //!< Return the current device engine unique ID
MessageQueue *getDeviceInputMessageQueue(); MessageQueue *getDeviceEngineInputMessageQueue();
MessageQueue *getDeviceOutputMessageQueue(); MessageQueue *getDeviceEngineOutputMessageQueue();
void configureCorrections(bool dcOffsetCorrection, bool iqImbalanceCorrection); //!< Configure current device engine DSP corrections void configureCorrections(bool dcOffsetCorrection, bool iqImbalanceCorrection); //!< Configure current device engine DSP corrections
// device related stuff // device related stuff