1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00

Reverse API: network reply error message enhancement. Added Q_OBJECT to test source and RTL-SDR input definitions to handle network reply correctly.

This commit is contained in:
f4exb
2018-12-18 06:14:18 +01:00
parent 35538ab9c1
commit 1dc8ca3a98
5 changed files with 65 additions and 19 deletions
+11 -6
View File
@@ -62,7 +62,7 @@ RTLSDRInput::RTLSDRInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI->addSink(m_fileSink);
m_networkManager = new QNetworkAccessManager();
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
}
RTLSDRInput::~RTLSDRInput()
@@ -73,10 +73,10 @@ RTLSDRInput::~RTLSDRInput()
if (m_running) {
stop();
}
m_deviceAPI->removeSink(m_fileSink);
delete m_fileSink;
closeDevice();
}
@@ -831,7 +831,7 @@ void RTLSDRInput::webapiReverseSendStartStop(bool start)
.arg(m_settings.m_reverseAPIAddress)
.arg(m_settings.m_reverseAPIPort)
.arg(m_settings.m_reverseAPIDeviceIndex);
m_networkRequest.setUrl(QUrl(channelSettingsURL));
m_networkRequest.setUrl(QUrl(channelSettingsURL));
if (start) {
m_networkManager->sendCustomRequest(m_networkRequest, "POST");
@@ -842,9 +842,14 @@ void RTLSDRInput::webapiReverseSendStartStop(bool start)
void RTLSDRInput::networkManagerFinished(QNetworkReply *reply)
{
if (reply->error())
QNetworkReply::NetworkError replyError = reply->error();
if (replyError)
{
qDebug() << "RTLSDRInput::networkManagerFinished: error: " << reply->errorString();
qWarning() << "TestSourceInput::networkManagerFinished:"
<< " error(" << (int) replyError
<< "): " << replyError
<< ": " << reply->errorString();
return;
}