diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp index a6e3c19c2..81a6d4239 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp @@ -453,7 +453,7 @@ bool BladerfOutput::applySettings(const BladeRFOutputSettings& settings, bool fo { int sampleRate = m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); + m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); } qDebug() << "BladerfOutput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz" diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp index 9af44a893..d1c6095ca 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp @@ -63,7 +63,7 @@ BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : char recFileNameCStr[30]; sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); - connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); + connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); } BladerfOutputGui::~BladerfOutputGui() @@ -140,7 +140,7 @@ void BladerfOutputGui::handleDSPMessages() { Message* message; - while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) + while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0) { qDebug("BladerfOutputGui::handleDSPMessages: message: %s", message->getIdentifier()); diff --git a/plugins/samplesink/filesink/filesinkgui.cpp b/plugins/samplesink/filesink/filesinkgui.cpp index f1436f637..8f6ffcea3 100644 --- a/plugins/samplesink/filesink/filesinkgui.cpp +++ b/plugins/samplesink/filesink/filesinkgui.cpp @@ -69,7 +69,7 @@ FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : connect(m_deviceSampleSink->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSinkMessages())); m_deviceAPI->setSink(m_deviceSampleSink); - connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); + connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); } FileSinkGui::~FileSinkGui() @@ -152,7 +152,7 @@ void FileSinkGui::handleDSPMessages() { Message* message; - while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) + while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0) { qDebug("FileSinkGui::handleDSPMessages: message: %s", message->getIdentifier()); diff --git a/plugins/samplesink/filesink/filesinkoutput.cpp b/plugins/samplesink/filesink/filesinkoutput.cpp index 830a9efd1..d52b20516 100644 --- a/plugins/samplesink/filesink/filesinkoutput.cpp +++ b/plugins/samplesink/filesink/filesinkoutput.cpp @@ -234,7 +234,7 @@ void FileSinkOutput::applySettings(const FileSinkSettings& settings, bool force) m_settings.m_sampleRate, m_settings.m_log2Interp); DSPSignalNotification *notif = new DSPSignalNotification(m_settings.m_sampleRate, m_settings.m_centerFrequency); - m_deviceAPI->getDeviceInputMessageQueue()->push(notif); + m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); } } diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp index 0a171d06a..ff4a12e93 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp @@ -376,7 +376,7 @@ bool HackRFOutput::applySettings(const HackRFOutputSettings& settings, bool forc { int sampleRate = m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); + m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); } return true; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index d4f73bbeb..7b0787a3c 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -57,7 +57,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : displaySettings(); displayBandwidths(); - connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); + connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); } HackRFOutputGui::~HackRFOutputGui() @@ -137,7 +137,7 @@ void HackRFOutputGui::handleDSPMessages() { Message* message; - while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) + while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0) { qDebug("HackRFOutputGui::handleDSPMessages: message: %s", message->getIdentifier()); diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index b1449cd94..bee8c3c53 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -434,7 +434,7 @@ bool LimeSDROutput::handleMessage(const Message& message) status.sampleRate, status.linkRate, status.timestamp); - m_deviceAPI->getDeviceOutputMessageQueue()->push(report); + m_deviceAPI->getDeviceEngineOutputMessageQueue()->push(report); } else { @@ -449,7 +449,7 @@ bool LimeSDROutput::handleMessage(const Message& message) 0, // status.sampleRate, 0, // status.linkRate, 0); // status.timestamp); - m_deviceAPI->getDeviceOutputMessageQueue()->push(report); + m_deviceAPI->getDeviceEngineOutputMessageQueue()->push(report); } return true; @@ -469,7 +469,7 @@ bool LimeSDROutput::handleMessage(const Message& message) // send to oneself DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp); - m_deviceAPI->getDeviceOutputMessageQueue()->push(report); + m_deviceAPI->getDeviceEngineOutputMessageQueue()->push(report); // send to source buddies const std::vector& sourceBuddies = m_deviceAPI->getSourceBuddies(); @@ -488,7 +488,7 @@ bool LimeSDROutput::handleMessage(const Message& message) for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp); - (*itSink)->getDeviceOutputMessageQueue()->push(report); + (*itSink)->getDeviceEngineOutputMessageQueue()->push(report); } return true; @@ -883,7 +883,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo DSPSignalNotification *notif = new DSPSignalNotification( m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); + m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); // send to sink buddies const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); @@ -897,12 +897,12 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo DSPSignalNotification *notif = new DSPSignalNotification( m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); + (*itSink)->getDeviceEngineInputMessageQueue()->push(notif); MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( m_settings.m_centerFrequency, m_settings.m_devSampleRate, m_settings.m_log2HardInterp); - (*itSink)->getDeviceOutputMessageQueue()->push(report); + (*itSink)->getDeviceEngineOutputMessageQueue()->push(report); } // send to source buddies @@ -932,7 +932,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo // send to self first DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency + ncoShift); - m_deviceAPI->getDeviceInputMessageQueue()->push(notif); + m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); // send to sink buddies const std::vector& sinkBuddies = m_deviceAPI->getSinkBuddies(); @@ -944,12 +944,12 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo uint64_t buddyCenterFreq = buddySharedPtr->m_centerFrequency; int buddyNCOFreq = buddySharedPtr->m_ncoFrequency; DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, buddyCenterFreq + buddyNCOFreq); // do not change center frequency - (*itSink)->getDeviceInputMessageQueue()->push(notif); + (*itSink)->getDeviceEngineInputMessageQueue()->push(notif); MsgReportLimeSDRToGUI *report = MsgReportLimeSDRToGUI::create( m_settings.m_centerFrequency, m_settings.m_devSampleRate, m_settings.m_log2HardInterp); - (*itSink)->getDeviceOutputMessageQueue()->push(report); + (*itSink)->getDeviceEngineOutputMessageQueue()->push(report); } } else if (forwardChangeOwnDSP) @@ -959,7 +959,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, bool fo int sampleRate = m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); + m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); } qDebug() << "LimeSDROutput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz" diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index a2f39f788..b4aec87c4 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -76,7 +76,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, QWidget* parent) : char recFileNameCStr[30]; sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); - connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleMessagesToGUI()), Qt::QueuedConnection); + connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleMessagesToGUI()), Qt::QueuedConnection); } LimeSDROutputGUI::~LimeSDROutputGUI() @@ -148,7 +148,7 @@ void LimeSDROutputGUI::handleMessagesToGUI() { Message* message; - while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) + while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0) { if (DSPSignalNotification::match(*message)) { diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp index 773fc0548..8ff0cb53b 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp @@ -87,7 +87,7 @@ SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : connect(m_deviceSampleSink->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSinkMessages())); m_deviceAPI->setSink(m_deviceSampleSink); - connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); + connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); m_time.start(); displayEventCounts(); @@ -188,7 +188,7 @@ void SDRdaemonSinkGui::handleDSPMessages() { Message* message; - while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0) + while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0) { qDebug("SDRdaemonSinkGui::handleDSPMessages: message: %s", message->getIdentifier()); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp index 2457b16bd..70bcce5f7 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp @@ -263,7 +263,7 @@ void SDRdaemonSinkOutput::applySettings(const SDRdaemonSinkSettings& settings, b if (forwardChange) { DSPSignalNotification *notif = new DSPSignalNotification(m_settings.m_sampleRate, m_settings.m_centerFrequency); - m_deviceAPI->getDeviceInputMessageQueue()->push(notif); + m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); } } diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp index 317a15c82..41a318d80 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp @@ -308,7 +308,7 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force) { DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; DeviceHackRFShared::MsgConfigureFrequencyDelta *deltaMsg = DeviceHackRFShared::MsgConfigureFrequencyDelta::create(settings.m_centerFrequency - m_settings.m_centerFrequency); - buddy->getDeviceOutputMessageQueue()->push(deltaMsg); + buddy->getDeviceEngineOutputMessageQueue()->push(deltaMsg); } } diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index 2aca5ca00..c4d0d732d 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -486,7 +486,7 @@ bool LimeSDRInput::handleMessage(const Message& message) for (; itSink != sinkBuddies.end(); ++itSink) { DeviceLimeSDRShared::MsgReportDeviceInfo *report = DeviceLimeSDRShared::MsgReportDeviceInfo::create(temp); - (*itSink)->getDeviceOutputMessageQueue()->push(report); + (*itSink)->getDeviceEngineOutputMessageQueue()->push(report); } return true; @@ -1080,9 +1080,9 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc DSPSignalNotification *notif = new DSPSignalNotification( m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); + (*itSink)->getDeviceEngineInputMessageQueue()->push(notif); DeviceLimeSDRShared::MsgCrossReportToGUI *report = DeviceLimeSDRShared::MsgCrossReportToGUI::create(m_settings.m_devSampleRate); - (*itSink)->getDeviceOutputMessageQueue()->push(report); + (*itSink)->getDeviceEngineOutputMessageQueue()->push(report); } } else if (forwardChangeRxDSP) diff --git a/sdrbase/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp index 49f2d9ea0..4c2bddf68 100644 --- a/sdrbase/device/devicesinkapi.cpp +++ b/sdrbase/device/devicesinkapi.cpp @@ -114,12 +114,12 @@ uint DeviceSinkAPI::getDeviceUID() const return m_deviceSinkEngine->getUID(); } -MessageQueue *DeviceSinkAPI::getDeviceInputMessageQueue() +MessageQueue *DeviceSinkAPI::getDeviceEngineInputMessageQueue() { return m_deviceSinkEngine->getInputMessageQueue(); } -MessageQueue *DeviceSinkAPI::getDeviceOutputMessageQueue() +MessageQueue *DeviceSinkAPI::getDeviceEngineOutputMessageQueue() { return m_deviceSinkEngine->getOutputMessageQueue(); } diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h index 327a2e980..b6eff9028 100644 --- a/sdrbase/device/devicesinkapi.h +++ b/sdrbase/device/devicesinkapi.h @@ -56,8 +56,8 @@ public: DSPDeviceSinkEngine::State state() const; //!< device engine state QString errorMessage(); //!< Return the current device engine error message uint getDeviceUID() const; //!< Return the current device engine unique ID - MessageQueue *getDeviceInputMessageQueue(); - MessageQueue *getDeviceOutputMessageQueue(); + MessageQueue *getDeviceEngineInputMessageQueue(); + MessageQueue *getDeviceEngineOutputMessageQueue(); // device related stuff GLSpectrum *getSpectrum(); //!< Direct spectrum getter void addChannelMarker(ChannelMarker* channelMarker); //!< Add channel marker to spectrum