VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00
Code Issues Projects Releases Wiki Activity

Migration of DaemonSource channel to RemoteSource

Browse Source
This commit is contained in:
f4exb
2019-01-23 00:44:13 +01:00
parent 5b04cf4b5a
commit c294f0a017
40 changed files with 768 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapirequestmapper.cpp
+7 -7
View File
@@ -2266,14 +2266,14 @@ bool WebAPIRequestMapper::validateChannelSettings(
return false;
}
}
else if (*channelType == "DaemonSource")
else if (*channelType == "RemoteSource")
{
if (channelSettings.getTx() != 0)
{
QJsonObject daemonChannelSourceSettingsJsonObject = jsonObject["DaemonSourceSettings"].toObject();
channelSettingsKeys = daemonChannelSourceSettingsJsonObject.keys();
channelSettings.setDaemonSourceSettings(new SWGSDRangel::SWGDaemonSourceSettings());
channelSettings.getDaemonSourceSettings()->fromJsonObject(daemonChannelSourceSettingsJsonObject);
QJsonObject remoteChannelSourceSettingsJsonObject = jsonObject["RemoteSourceSettings"].toObject();
channelSettingsKeys = remoteChannelSourceSettingsJsonObject.keys();
channelSettings.setRemoteSourceSettings(new SWGSDRangel::SWGRemoteSourceSettings());
channelSettings.getRemoteSourceSettings()->fromJsonObject(remoteChannelSourceSettingsJsonObject);
return true;
}
else {
@@ -2519,7 +2519,7 @@ void WebAPIRequestMapper::resetChannelSettings(SWGSDRangel::SWGChannelSettings&
channelSettings.setNfmDemodSettings(0);
channelSettings.setNfmModSettings(0);
channelSettings.setRemoteSinkSettings(0);
channelSettings.setDaemonSourceSettings(0);
channelSettings.setRemoteSourceSettings(0);
channelSettings.setSsbDemodSettings(0);
channelSettings.setSsbModSettings(0);
channelSettings.setUdpSourceSettings(0);
@@ -2539,7 +2539,7 @@ void WebAPIRequestMapper::resetChannelReport(SWGSDRangel::SWGChannelReport& chan
channelReport.setDsdDemodReport(0);
channelReport.setNfmDemodReport(0);
channelReport.setNfmModReport(0);
channelReport.setDaemonSourceReport(0);
channelReport.setRemoteSourceReport(0);
channelReport.setSsbDemodReport(0);
channelReport.setSsbModReport(0);
channelReport.setUdpSourceReport(0);