1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-28 07:46:37 -04:00

Reverse API: RTL-SDR input changes (3)

This commit is contained in:
f4exb 2018-12-17 18:38:52 +01:00
parent 082fcc000d
commit 91ffa1cf3c
2 changed files with 13 additions and 3 deletions

View File

@ -60,13 +60,23 @@ RTLSDRInput::RTLSDRInput(DeviceSourceAPI *deviceAPI) :
m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID())); m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
m_networkManager = new QNetworkAccessManager();
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
} }
RTLSDRInput::~RTLSDRInput() RTLSDRInput::~RTLSDRInput()
{ {
if (m_running) stop(); disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
delete m_networkManager;
if (m_running) {
stop();
}
m_deviceAPI->removeSink(m_fileSink); m_deviceAPI->removeSink(m_fileSink);
delete m_fileSink; delete m_fileSink;
closeDevice(); closeDevice();
} }
@ -798,7 +808,7 @@ void RTLSDRInput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys,
swgRtlSdrSettings->setFileRecordName(new QString(settings.m_fileRecordName)); swgRtlSdrSettings->setFileRecordName(new QString(settings.m_fileRecordName));
} }
QString channelSettingsURL = QString("http://%1:%2/sdrangel/deviceset/%3/settings") QString channelSettingsURL = QString("http://%1:%2/sdrangel/deviceset/%3/device/settings")
.arg(settings.m_reverseAPIAddress) .arg(settings.m_reverseAPIAddress)
.arg(settings.m_reverseAPIPort) .arg(settings.m_reverseAPIPort)
.arg(settings.m_reverseAPIDeviceIndex); .arg(settings.m_reverseAPIDeviceIndex);

View File

@ -14,7 +14,7 @@
const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = { const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
QString("RTL-SDR Input"), QString("RTL-SDR Input"),
QString("4.3.1"), QString("4.3.2"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,