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

Removed file recording function from device plugins

Browse Source
This commit is contained in:
f4exb
2020-08-08 11:53:56 +02:00
parent db7ae9a0cd
commit e6e7ece46c
241 changed files with 250 additions and 4140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapirequestmapper.cpp
+12 -111
View File
@@ -3487,100 +3487,20 @@ bool WebAPIRequestMapper::getDeviceActions(
if (deviceKeys.contains(deviceActionsKey) && deviceActionsJson[deviceActionsKey].isObject())
{
QJsonObject actionsJsonObject = deviceActionsJson[deviceActionsKey].toObject();
deviceActionsKeys = actionsJsonObject.keys();
// QJsonObject actionsJsonObject = deviceActionsJson[deviceActionsKey].toObject();
// deviceActionsKeys = actionsJsonObject.keys();
if (deviceActionsKey == "airspyActions")
{
deviceActions->setAirspyActions(new SWGSDRangel::SWGAirspyActions());
deviceActions->getAirspyActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "airspyHFActions")
{
deviceActions->setAirspyHfActions(new SWGSDRangel::SWGAirspyHFActions());
deviceActions->getAirspyHfActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "bladeRF1InputActions")
{
deviceActions->setBladeRf1InputActions(new SWGSDRangel::SWGBladeRF1InputActions());
deviceActions->getBladeRf1InputActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "fcdProActions")
{
deviceActions->setFcdProActions(new SWGSDRangel::SWGFCDProActions());
deviceActions->getFcdProActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "fcdProPlusActions")
{
deviceActions->setFcdProPlusActions(new SWGSDRangel::SWGFCDProPlusActions());
deviceActions->getFcdProPlusActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "hackRFInputActions")
{
deviceActions->setHackRfInputActions(new SWGSDRangel::SWGHackRFInputActions());
deviceActions->getHackRfInputActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "kiwiSDRActions")
{
deviceActions->setKiwiSdrActions(new SWGSDRangel::SWGKiwiSDRActions());
deviceActions->getKiwiSdrActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "limeSdrInputActions")
{
deviceActions->setLimeSdrInputActions(new SWGSDRangel::SWGLimeSdrInputActions());
deviceActions->getLimeSdrInputActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "localInputActions")
{
deviceActions->setLocalInputActions(new SWGSDRangel::SWGLocalInputActions());
deviceActions->getLocalInputActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "perseusActions")
{
deviceActions->setPerseusActions(new SWGSDRangel::SWGPerseusActions());
deviceActions->getPerseusActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "plutoSdrInputActions")
{
deviceActions->setPlutoSdrInputActions(new SWGSDRangel::SWGPlutoSdrInputActions());
deviceActions->getPlutoSdrInputActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "remoteInputActions")
{
deviceActions->setRemoteInputActions(new SWGSDRangel::SWGRemoteInputActions());
deviceActions->getRemoteInputActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "rtlSdrActions")
{
deviceActions->setRtlSdrActions(new SWGSDRangel::SWGRtlSdrActions());
deviceActions->getRtlSdrActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "sdrPlayActions")
{
deviceActions->setSdrPlayActions(new SWGSDRangel::SWGSDRPlayActions());
deviceActions->getSdrPlayActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "soapySDRInputActions")
{
deviceActions->setSoapySdrInputActions(new SWGSDRangel::SWGSoapySDRInputActions());
deviceActions->getSoapySdrInputActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "testSourceActions")
{
deviceActions->setTestSourceActions(new SWGSDRangel::SWGTestSourceActions());
deviceActions->getTestSourceActions()->fromJsonObject(actionsJsonObject);
}
else if (deviceActionsKey == "xtrxInputActions")
{
deviceActions->setXtrxInputActions(new SWGSDRangel::SWGXtrxInputActions());
deviceActions->getXtrxInputActions()->fromJsonObject(actionsJsonObject);
}
else
{
// if (deviceActionsKey == "xtrxInputActions")
// {
// deviceActions->setXtrxInputActions(new SWGSDRangel::SWGXtrxInputActions());
// deviceActions->getXtrxInputActions()->fromJsonObject(actionsJsonObject);
// }
// else
// {
return false;
}
// }
return true;
// return true;
}
else
{
@@ -3674,23 +3594,7 @@ void WebAPIRequestMapper::resetDeviceActions(SWGSDRangel::SWGDeviceActions& devi
{
deviceActions.cleanup();
deviceActions.setDeviceHwType(nullptr);
deviceActions.setAirspyActions(nullptr);
deviceActions.setAirspyHfActions(nullptr);
deviceActions.setBladeRf1InputActions(nullptr);
deviceActions.setFcdProActions(nullptr);
deviceActions.setFcdProPlusActions(nullptr);
deviceActions.setHackRfInputActions(nullptr);
deviceActions.setKiwiSdrActions(nullptr);
deviceActions.setLimeSdrInputActions(nullptr);
deviceActions.setLocalInputActions(nullptr);
deviceActions.setPerseusActions(nullptr);
deviceActions.setPlutoSdrInputActions(nullptr);
deviceActions.setRemoteInputActions(nullptr);
deviceActions.setRtlSdrActions(nullptr);
deviceActions.setSdrPlayActions(nullptr);
deviceActions.setSoapySdrInputActions(nullptr);
deviceActions.setTestSourceActions(nullptr);
deviceActions.setXtrxInputActions(nullptr);
// deviceActions.setXtrxInputActions(nullptr);
}
void WebAPIRequestMapper::resetChannelSettings(SWGSDRangel::SWGChannelSettings& channelSettings)
@@ -3915,9 +3819,6 @@ void WebAPIRequestMapper::processSoapySDRSettings(
if (deviceSettingsJson.contains("transverterDeltaFrequency")) {
swgSoapySDRInputSettings->setTransverterDeltaFrequency(deviceSettingsJson["transverterDeltaFrequency"].toInt());
}
if (deviceSettingsJson.contains("fileRecordName")) {
swgSoapySDRInputSettings->setFileRecordName(new QString(deviceSettingsJson["fileRecordName"].toString()));
}
if (deviceSettingsJson.contains("antenna")) {
swgSoapySDRInputSettings->setAntenna(new QString(deviceSettingsJson["antenna"].toString()));
}