From a1d2eabeb8572839eb33ae7cbab5c380fff4ee4a Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 5 Sep 2017 00:47:12 +0200 Subject: [PATCH] FileRecord: make sure the DSP notification is processed through before sending to a message queue --- plugins/samplesource/airspy/airspyinput.cpp | 2 +- plugins/samplesource/bladerfinput/bladerfinput.cpp | 2 +- plugins/samplesource/fcdpro/fcdproinput.cpp | 2 +- plugins/samplesource/fcdproplus/fcdproplusinput.cpp | 2 +- plugins/samplesource/hackrfinput/hackrfinput.cpp | 2 +- plugins/samplesource/limesdrinput/limesdrinput.cpp | 2 +- plugins/samplesource/rtlsdr/rtlsdrinput.cpp | 2 +- plugins/samplesource/sdrplay/sdrplayinput.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp index bf2f0f6ac..100d250d8 100644 --- a/plugins/samplesource/airspy/airspyinput.cpp +++ b/plugins/samplesource/airspy/airspyinput.cpp @@ -500,8 +500,8 @@ bool AirspyInput::applySettings(const AirspySettings& settings, bool force) { int sampleRate = devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); m_fileSink->handleMessage(*notif); // forward to file sink + m_deviceAPI->getDeviceInputMessageQueue()->push(notif); } return true; diff --git a/plugins/samplesource/bladerfinput/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp index 8339fb6e3..f8084a019 100644 --- a/plugins/samplesource/bladerfinput/bladerfinput.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp @@ -509,8 +509,8 @@ bool BladerfInput::applySettings(const BladeRFInputSettings& settings, bool forc { int sampleRate = m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); m_fileSink->handleMessage(*notif); // forward to file sink + m_deviceAPI->getDeviceInputMessageQueue()->push(notif); } qDebug() << "BladerfInput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz" diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index d015e1d94..534bd8a25 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -394,8 +394,8 @@ void FCDProInput::applySettings(const FCDProSettings& settings, bool force) if (signalChange) { DSPSignalNotification *notif = new DSPSignalNotification(fcd_traits::sampleRate, m_settings.m_centerFrequency); - m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_fileSink->handleMessage(*notif); // forward to file sink + m_deviceAPI->getDeviceInputMessageQueue()->push(notif); } } diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index 22f0d4860..378947cb8 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -288,8 +288,8 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for if (signalChange) { DSPSignalNotification *notif = new DSPSignalNotification(fcd_traits::sampleRate, m_settings.m_centerFrequency); - m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_fileSink->handleMessage(*notif); // forward to file sink + m_deviceAPI->getDeviceInputMessageQueue()->push(notif); } } diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp index a2595d072..0f1be0bda 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp @@ -463,8 +463,8 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force) { int sampleRate = devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); m_fileSink->handleMessage(*notif); // forward to file sink + m_deviceAPI->getDeviceInputMessageQueue()->push(notif); } m_settings.m_linkTxFrequency = settings.m_linkTxFrequency; diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index e8c0c88b0..4d9de41f0 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -1120,8 +1120,8 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, bool forc int sampleRate = m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); m_fileSink->handleMessage(*notif); // forward to file sink + m_deviceAPI->getDeviceInputMessageQueue()->push(notif); } qDebug() << "LimeSDRInput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz" diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index 60356f608..565ae21b6 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -421,8 +421,8 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force) { int sampleRate = m_settings.m_devSampleRate/(1<getDeviceInputMessageQueue()->push(notif); m_fileSink->handleMessage(*notif); // forward to file sink + m_deviceAPI->getDeviceInputMessageQueue()->push(notif); } return true; diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp index b1d2c7d9c..cfb549d19 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.cpp +++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp @@ -530,8 +530,8 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool forwardCh { int sampleRate = getSampleRate(); DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, m_settings.m_centerFrequency); - m_deviceAPI->getDeviceInputMessageQueue()->push(notif); m_fileSink->handleMessage(*notif); // forward to file sink + m_deviceAPI->getDeviceInputMessageQueue()->push(notif); } return true;