Fixed wrong structure being used in some sample source and sink plugins web API adapters. Fixes #842

plugins/samplesink/audiooutput/audiooutputwebapiadapter.cpp

@@ -30,8 +30,8 @@ int AudioOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setAudioOutputSettings(new SWGSDRangel::SWGAudioOutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getAudioOutputSettings()->init();
     AudioOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int BladeRF1OutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setBladeRf1OutputSettings(new SWGSDRangel::SWGBladeRF1OutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getBladeRf1OutputSettings()->init();
     Bladerf1Output::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int BladeRF2OutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setBladeRf2OutputSettings(new SWGSDRangel::SWGBladeRF2OutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getBladeRf2OutputSettings()->init();
     BladeRF2Output::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int HackRFOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setHackRfOutputSettings(new SWGSDRangel::SWGHackRFOutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getHackRfOutputSettings()->init();
     HackRFOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int LimeSDROutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setLimeSdrOutputSettings(new SWGSDRangel::SWGLimeSdrOutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getLimeSdrOutputSettings()->init();
     LimeSDROutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/localoutput/localoutputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int LocalOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setLocalOutputSettings(new SWGSDRangel::SWGLocalOutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getLocalOutputSettings()->init();
     LocalOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int PlutoSDROutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setPlutoSdrOutputSettings(new SWGSDRangel::SWGPlutoSdrOutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getPlutoSdrOutputSettings()->init();
     PlutoSDROutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int RemoteOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setRemoteOutputSettings(new SWGSDRangel::SWGRemoteOutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getRemoteOutputSettings()->init();
     RemoteOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int SoapySDROutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setSoapySdrOutputSettings(new SWGSDRangel::SWGSoapySDROutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getSoapySdrOutputSettings()->init();
     SoapySDROutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp

@@ -34,8 +34,8 @@ int USRPOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setUsrpOutputSettings(new SWGSDRangel::SWGUSRPOutputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getUsrpOutputSettings()->init();
     USRPOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/audioinput/audioinputwebapiadapter.cpp

@@ -31,8 +31,8 @@ int AudioInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setAudioInputSettings(new SWGSDRangel::SWGAudioInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getAudioInputSettings()->init();
     AudioInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int BladeRF1InputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setBladeRf1InputSettings(new SWGSDRangel::SWGBladeRF1InputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getBladeRf1InputSettings()->init();
     Bladerf1Input::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int BladeRF2InputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setBladeRf2InputSettings(new SWGSDRangel::SWGBladeRF2InputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getBladeRf2InputSettings()->init();
     BladeRF2Input::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp

@@ -33,8 +33,8 @@ int FCDProWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setFcdProSettings(new SWGSDRangel::SWGFCDProSettings());
-    response.getAirspyHfSettings()->init();
+    response.getFcdProSettings()->init();
     FCDProInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp

@@ -33,8 +33,8 @@ int FCDProPlusWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setFcdProPlusSettings(new SWGSDRangel::SWGFCDProPlusSettings());
-    response.getAirspyHfSettings()->init();
+    response.getFcdProPlusSettings()->init();
     FCDProPlusInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/fileinput/fileinputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int FileInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setFileInputSettings(new SWGSDRangel::SWGFileInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getFileInputSettings()->init();
     FileInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp

@@ -33,8 +33,8 @@ int KiwiSDRWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setKiwiSdrSettings(new SWGSDRangel::SWGKiwiSDRSettings());
-    response.getAirspyHfSettings()->init();
+    response.getKiwiSdrSettings()->init();
     KiwiSDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int LimeSDRInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setLimeSdrInputSettings(new SWGSDRangel::SWGLimeSdrInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getLimeSdrInputSettings()->init();
     LimeSDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/localinput/localinputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int LocalInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setLocalInputSettings(new SWGSDRangel::SWGLocalInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getLocalInputSettings()->init();
     LocalInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/perseus/perseuswebapiadapter.cpp

@@ -33,8 +33,8 @@ int PerseusWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setPerseusSettings(new SWGSDRangel::SWGPerseusSettings());
-    response.getAirspyHfSettings()->init();
+    response.getPerseusSettings()->init();
     PerseusInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int PlutoSDRInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setPlutoSdrInputSettings(new SWGSDRangel::SWGPlutoSdrInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getPlutoSdrInputSettings()->init();
     PlutoSDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int RemoteInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setRemoteInputSettings(new SWGSDRangel::SWGRemoteInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getRemoteInputSettings()->init();
     RemoteInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp

@@ -33,8 +33,8 @@ int RTLSDRWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setRtlSdrSettings(new SWGSDRangel::SWGRtlSdrSettings());
-    response.getAirspyHfSettings()->init();
+    response.getRtlSdrSettings()->init();
     RTLSDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp

@@ -33,8 +33,8 @@ int SDRPlayWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setSdrPlaySettings(new SWGSDRangel::SWGSDRPlaySettings());
-    response.getAirspyHfSettings()->init();
+    response.getSdrPlaySettings()->init();
     SDRPlayInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int SigMFFileInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setSigMfFileInputSettings(new SWGSDRangel::SWGSigMFFileInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getSigMfFileInputSettings()->init();
     SigMFFileInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp

@@ -33,8 +33,8 @@ int SoapySDRInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setSoapySdrInputSettings(new SWGSDRangel::SWGSoapySDRInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getSoapySdrInputSettings()->init();
     SoapySDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/testsource/testsourcewebapiadapter.cpp

@@ -33,8 +33,8 @@ int TestSourceWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setTestSourceSettings(new SWGSDRangel::SWGTestSourceSettings());
-    response.getAirspyHfSettings()->init();
+    response.getTestSourceSettings()->init();
     TestSourceInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }

plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp

@@ -34,8 +34,8 @@ int USRPInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
+    response.setUsrpInputSettings(new SWGSDRangel::SWGUSRPInputSettings());
-    response.getAirspyHfSettings()->init();
+    response.getUsrpInputSettings()->init();
     USRPInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }