|
|
|
|
@ -20,6 +20,7 @@
@@ -20,6 +20,7 @@
|
|
|
|
|
#include <QDebug> |
|
|
|
|
#include <QNetworkAccessManager> |
|
|
|
|
#include <QNetworkReply> |
|
|
|
|
#include <QBuffer> |
|
|
|
|
|
|
|
|
|
#include "SWGChannelSettings.h" |
|
|
|
|
#include "SWGDATVDemodSettings.h" |
|
|
|
|
@ -51,11 +52,15 @@ DATVDemod::DATVDemod(DeviceAPI *deviceAPI) :
@@ -51,11 +52,15 @@ DATVDemod::DATVDemod(DeviceAPI *deviceAPI) :
|
|
|
|
|
m_deviceAPI->addChannelSink(this); |
|
|
|
|
m_deviceAPI->addChannelSinkAPI(this); |
|
|
|
|
|
|
|
|
|
m_networkManager = new QNetworkAccessManager(); |
|
|
|
|
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
DATVDemod::~DATVDemod() |
|
|
|
|
{ |
|
|
|
|
qDebug("DATVDemod::~DATVDemod"); |
|
|
|
|
disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); |
|
|
|
|
delete m_networkManager; |
|
|
|
|
m_deviceAPI->removeChannelSinkAPI(this); |
|
|
|
|
m_deviceAPI->removeChannelSink(this); |
|
|
|
|
|
|
|
|
|
@ -605,6 +610,31 @@ void DATVDemod::webapiFormatChannelSettings(
@@ -605,6 +610,31 @@ void DATVDemod::webapiFormatChannelSettings(
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void DATVDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const DATVDemodSettings& settings, bool force) |
|
|
|
|
{ |
|
|
|
|
SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings(); |
|
|
|
|
webapiFormatChannelSettings(channelSettingsKeys, swgChannelSettings, settings, force); |
|
|
|
|
|
|
|
|
|
QString channelSettingsURL = QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/settings") |
|
|
|
|
.arg(settings.m_reverseAPIAddress) |
|
|
|
|
.arg(settings.m_reverseAPIPort) |
|
|
|
|
.arg(settings.m_reverseAPIDeviceIndex) |
|
|
|
|
.arg(settings.m_reverseAPIChannelIndex); |
|
|
|
|
m_networkRequest.setUrl(QUrl(channelSettingsURL)); |
|
|
|
|
m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); |
|
|
|
|
|
|
|
|
|
QBuffer *buffer = new QBuffer(); |
|
|
|
|
buffer->open((QBuffer::ReadWrite)); |
|
|
|
|
buffer->write(swgChannelSettings->asJson().toUtf8()); |
|
|
|
|
buffer->seek(0); |
|
|
|
|
|
|
|
|
|
// Always use PATCH to avoid passing reverse API settings
|
|
|
|
|
QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer); |
|
|
|
|
buffer->setParent(reply); |
|
|
|
|
|
|
|
|
|
delete swgChannelSettings; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void DATVDemod::networkManagerFinished(QNetworkReply *reply) |
|
|
|
|
{ |
|
|
|
|
QNetworkReply::NetworkError replyError = reply->error(); |
|
|
|
|
|