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

Migration of DaemonSink channel to RemoteSink

Browse Source
This commit is contained in:
f4exb
2019-01-22 23:39:12 +01:00
parent e5b23e9864
commit 5b04cf4b5a
34 changed files with 581 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapirequestmapper.cpp
+6 -6
View File
@@ -2252,14 +2252,14 @@ bool WebAPIRequestMapper::validateChannelSettings(
return false;
}
}
else if (*channelType == "DaemonSink")
else if (*channelType == "RemoteSink")
{
if (channelSettings.getTx() == 0)
{
QJsonObject daemonChannelSinkSettingsJsonObject = jsonObject["DaemonSinkSettings"].toObject();
channelSettingsKeys = daemonChannelSinkSettingsJsonObject.keys();
channelSettings.setDaemonSinkSettings(new SWGSDRangel::SWGDaemonSinkSettings());
channelSettings.getDaemonSinkSettings()->fromJsonObject(daemonChannelSinkSettingsJsonObject);
QJsonObject remoteChannelSinkSettingsJsonObject = jsonObject["RemoteSinkSettings"].toObject();
channelSettingsKeys = remoteChannelSinkSettingsJsonObject.keys();
channelSettings.setRemoteSinkSettings(new SWGSDRangel::SWGRemoteSinkSettings());
channelSettings.getRemoteSinkSettings()->fromJsonObject(remoteChannelSinkSettingsJsonObject);
return true;
}
else {
@@ -2518,7 +2518,7 @@ void WebAPIRequestMapper::resetChannelSettings(SWGSDRangel::SWGChannelSettings&
channelSettings.setDsdDemodSettings(0);
channelSettings.setNfmDemodSettings(0);
channelSettings.setNfmModSettings(0);
channelSettings.setDaemonSinkSettings(0);
channelSettings.setRemoteSinkSettings(0);
channelSettings.setDaemonSourceSettings(0);
channelSettings.setSsbDemodSettings(0);
channelSettings.setSsbModSettings(0);