mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-07-08 20:05:30 -04:00
Fix bug that prevents settings changes updates via reverse API
Most plugins that use reverse API to PATCH settings updates to remote server only do so when `useReverseAPI` is toggled, but not when the relevant settings are being updated. So lets fix the precondition to use the `m_useReverseAPI` flag instead.
This commit is contained in:
parent
cdae5ca048
commit
15337cac66
plugins
channelrx
feature
antennatools
aprs
demodanalyzer
gs232controller
jogdialcontroller
map
pertester
radiosonde
rigctlserver
satellitetracker
sid
simpleptt
skymap
startracker
vorlocalizer
samplemimo
audiocatsiso
bladerf2mimo
limesdrmimo
plutosdrmimo
xtrxmimo
samplesink
aaroniartsaoutput
audiooutput
bladerf1output
bladerf2output
fileoutput
hackrfoutput
limesdroutput
localoutput
plutosdroutput
remoteoutput
xtrxoutput
samplesource
aaroniartsainput
airspy
airspyhf
androidsdrdriverinput
audioinput
bladerf2input
fcdpro
fcdproplus
fileinput
hackrfinput
kiwisdr
limesdrinput
localinput
perseus
plutosdrinput
remoteinput
remotetcpinput
rtlsdr
sdrplay
sdrplayv3
sigmffileinput
testsource
xtrxinput
@ -295,7 +295,7 @@ void M17Demod::applySettings(const M17DemodSettings& settings, const QList<QStri
|
|||||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -707,7 +707,7 @@ void FreqScanner::applySettings(const FreqScannerSettings& settings, const QStri
|
|||||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -376,7 +376,7 @@ void LocalSink::applySettings(const LocalSinkSettings& settings, const QList<QSt
|
|||||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -239,7 +239,7 @@ void RemoteTCPSink::applySettings(const RemoteTCPSinkSettings& settings, const Q
|
|||||||
MsgConfigureRemoteTCPSink *msg = MsgConfigureRemoteTCPSink::create(settings, settingsKeys, force, remoteChange);
|
MsgConfigureRemoteTCPSink *msg = MsgConfigureRemoteTCPSink::create(settings, settingsKeys, force, remoteChange);
|
||||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -101,7 +101,7 @@ void AntennaTools::applySettings(const AntennaToolsSettings& settings, const QLi
|
|||||||
{
|
{
|
||||||
qDebug() << "AntennaTools::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
qDebug() << "AntennaTools::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -214,7 +214,7 @@ void APRS::applySettings(const APRSSettings& settings, const QList<QString>& set
|
|||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -290,7 +290,7 @@ void DemodAnalyzer::applySettings(const DemodAnalyzerSettings& settings, const Q
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -296,7 +296,7 @@ void GS232Controller::applySettings(const GS232ControllerSettings& settings, con
|
|||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -174,7 +174,7 @@ void JogdialController::applySettings(const JogdialControllerSettings& settings,
|
|||||||
{
|
{
|
||||||
qDebug() << "JogdialController::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
qDebug() << "JogdialController::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -145,7 +145,7 @@ void Map::applySettings(const MapSettings& settings, const QList<QString>& setti
|
|||||||
{
|
{
|
||||||
qDebug() << "Map::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
qDebug() << "Map::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -196,7 +196,7 @@ void PERTester::applySettings(const PERTesterSettings& settings, const QList<QSt
|
|||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -139,7 +139,7 @@ void Radiosonde::applySettings(const RadiosondeSettings& settings, const QList<Q
|
|||||||
{
|
{
|
||||||
qDebug() << "Radiosonde::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
qDebug() << "Radiosonde::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -173,7 +173,7 @@ void RigCtlServer::applySettings(const RigCtlServerSettings& settings, const QLi
|
|||||||
);
|
);
|
||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -216,7 +216,7 @@ void SatelliteTracker::applySettings(const SatelliteTrackerSettings& settings, c
|
|||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -166,7 +166,7 @@ void SIDMain::applySettings(const SIDSettings& settings, const QList<QString>& s
|
|||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -214,7 +214,7 @@ void SimplePTT::applySettings(const SimplePTTSettings& settings, const QList<QSt
|
|||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -116,7 +116,7 @@ void SkyMap::applySettings(const SkyMapSettings& settings, const QList<QString>&
|
|||||||
{
|
{
|
||||||
qDebug() << "SkyMap::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
qDebug() << "SkyMap::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force;
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -253,7 +253,7 @@ void StarTracker::applySettings(const StarTrackerSettings& settings, const QList
|
|||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -347,7 +347,7 @@ void VORLocalizer::applySettings(const VORLocalizerSettings& settings, const QLi
|
|||||||
m_worker->getInputMessageQueue()->push(msg);
|
m_worker->getInputMessageQueue()->push(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -557,7 +557,7 @@ void AudioCATSISO::applySettings(const AudioCATSISOSettings& settings, const QLi
|
|||||||
forwardTxChange = true;
|
forwardTxChange = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -727,7 +727,7 @@ bool BladeRF2MIMO::applySettings(const BladeRF2MIMOSettings& settings, const QLi
|
|||||||
|
|
||||||
// Reverse API settings
|
// Reverse API settings
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -1012,7 +1012,7 @@ bool LimeSDRMIMO::applySettings(const LimeSDRMIMOSettings& settings, const QList
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -713,7 +713,7 @@ bool PlutoSDRMIMO::applySettings(const PlutoSDRMIMOSettings& settings, const QLi
|
|||||||
plutoBox->set_params(DevicePlutoSDRBox::DEVICE_PHY, params);
|
plutoBox->set_params(DevicePlutoSDRBox::DEVICE_PHY, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -770,7 +770,7 @@ bool XTRXMIMO::applySettings(const XTRXMIMOSettings& settings, const QList<QStri
|
|||||||
|
|
||||||
// Reverse API
|
// Reverse API
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -286,7 +286,7 @@ void AaroniaRTSAOutput::applySettings(const AaroniaRTSAOutputSettings& settings,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -238,7 +238,7 @@ void AudioOutput::applySettings(const AudioOutputSettings& settings, const QList
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -497,7 +497,7 @@ bool Bladerf1Output::applySettings(const BladeRF1OutputSettings& settings, const
|
|||||||
m_bladerfThread->startWork();
|
m_bladerfThread->startWork();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -903,7 +903,7 @@ bool BladeRF2Output::applySettings(const BladeRF2OutputSettings& settings, const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -316,7 +316,7 @@ void FileOutput::applySettings(const FileOutputSettings& settings, const QList<Q
|
|||||||
forwardChange = true;
|
forwardChange = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -495,7 +495,7 @@ bool HackRFOutput::applySettings(const HackRFOutputSettings& settings, const QLi
|
|||||||
m_hackRFThread->startWork();
|
m_hackRFThread->startWork();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -1006,7 +1006,7 @@ bool LimeSDROutput::applySettings(const LimeSDROutputSettings& settings, const Q
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -214,7 +214,7 @@ void LocalOutput::applySettings(const LocalOutputSettings& settings, const QList
|
|||||||
QString remoteAddress;
|
QString remoteAddress;
|
||||||
QList<QString> reverseAPIKeys;
|
QList<QString> reverseAPIKeys;
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -538,7 +538,7 @@ bool PlutoSDROutput::applySettings(const PlutoSDROutputSettings& settings, const
|
|||||||
plutoBox->set_params(DevicePlutoSDRBox::DEVICE_PHY, params);
|
plutoBox->set_params(DevicePlutoSDRBox::DEVICE_PHY, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -302,7 +302,7 @@ void RemoteOutput::applySettings(const RemoteOutputSettings& settings, const QLi
|
|||||||
|
|
||||||
mutexLocker.unlock();
|
mutexLocker.unlock();
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -906,7 +906,7 @@ bool XTRXOutput::applySettings(const XTRXOutputSettings& settings, const QList<Q
|
|||||||
forceNCOFrequency = true;
|
forceNCOFrequency = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -299,7 +299,7 @@ bool AaroniaRTSAInput::applySettings(const AaroniaRTSAInputSettings& settings, c
|
|||||||
emit setWorkerSampleRate(settings.m_sampleRate);
|
emit setWorkerSampleRate(settings.m_sampleRate);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -546,7 +546,7 @@ bool AirspyInput::applySettings(const AirspySettings& settings, const QList<QStr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -576,7 +576,7 @@ bool AirspyHFInput::applySettings(const AirspyHFSettings& settings, const QList<
|
|||||||
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
|
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -248,7 +248,7 @@ void AndroidSDRDriverInput::applySettings(const AndroidSDRDriverInputSettings& s
|
|||||||
|
|
||||||
mutexLocker.unlock();
|
mutexLocker.unlock();
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -310,7 +310,7 @@ void AudioInput::applySettings(const AudioInputSettings& settings, QList<QString
|
|||||||
settings.m_iqImbalance ? "true" : "false");
|
settings.m_iqImbalance ? "true" : "false");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -978,7 +978,7 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, const Q
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -495,7 +495,7 @@ void FCDProInput::applySettings(const FCDProSettings& settings, const QList<QStr
|
|||||||
m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqCorrection);
|
m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqCorrection);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -427,7 +427,7 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, const QL
|
|||||||
m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqImbalance);
|
m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqImbalance);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -554,7 +554,7 @@ bool FileInput::applySettings(const FileInputSettings& settings, const QList<QSt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -522,7 +522,7 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, const QList
|
|||||||
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
|
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -314,7 +314,7 @@ bool KiwiSDRInput::applySettings(const KiwiSDRSettings& settings, const QList<QS
|
|||||||
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
|
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -1162,7 +1162,7 @@ bool LimeSDRInput::applySettings(const LimeSDRInputSettings& settings, const QLi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -221,7 +221,7 @@ void LocalInput::applySettings(const LocalInputSettings& settings, const QList<Q
|
|||||||
|
|
||||||
mutexLocker.unlock();
|
mutexLocker.unlock();
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -402,7 +402,7 @@ bool PerseusInput::applySettings(const PerseusSettings& settings, const QList<QS
|
|||||||
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
|
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -591,7 +591,7 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, const Q
|
|||||||
plutoBox->set_params(DevicePlutoSDRBox::DEVICE_PHY, params);
|
plutoBox->set_params(DevicePlutoSDRBox::DEVICE_PHY, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -287,7 +287,7 @@ void RemoteInput::applySettings(const RemoteInputSettings& settings, const QList
|
|||||||
|
|
||||||
mutexLocker.unlock();
|
mutexLocker.unlock();
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -244,7 +244,7 @@ void RemoteTCPInput::applySettings(const RemoteTCPInputSettings& settings, const
|
|||||||
|
|
||||||
mutexLocker.unlock();
|
mutexLocker.unlock();
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -567,7 +567,7 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, const QList<QStr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -568,7 +568,7 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, const QList<QS
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -693,7 +693,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -836,7 +836,7 @@ bool SigMFFileInput::applySettings(const SigMFFileInputSettings& settings, const
|
|||||||
openFileStreams(settings.m_fileName);
|
openFileStreams(settings.m_fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -405,7 +405,7 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, const QL
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
@ -1007,7 +1007,7 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, const QList<QSt
|
|||||||
forceNCOFrequency = true;
|
forceNCOFrequency = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settingsKeys.contains("useReverseAPI"))
|
if (settings.m_useReverseAPI)
|
||||||
{
|
{
|
||||||
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
|
||||||
settingsKeys.contains("reverseAPIAddress") ||
|
settingsKeys.contains("reverseAPIAddress") ||
|
||||||
|
Loading…
x
Reference in New Issue
Block a user