Web API: fixed webapiSettingsGet not initializing own channel or device structure

This commit is contained in:
f4exb 2018-02-21 13:50:50 +01:00
parent 58086b422b
commit 0ce9035e0a
8 changed files with 8 additions and 1 deletions

View File

@ -544,6 +544,7 @@ int NFMDemod::webapiSettingsGet(
QString& errorMessage __attribute__((unused)))
{
response.setNfmDemodSettings(new SWGSDRangel::SWGNFMDemodSettings());
response.getNfmDemodSettings()->init();
webapiFormatChannelSettings(response, m_settings);
return 200;
}

View File

@ -507,6 +507,7 @@ int NFMMod::webapiSettingsGet(
QString& errorMessage __attribute__((unused)))
{
response.setNfmModSettings(new SWGSDRangel::SWGNFMModSettings());
response.getNfmModSettings()->init();
webapiFormatChannelSettings(response, m_settings);
return 200;
}

View File

@ -473,6 +473,7 @@ int HackRFOutput::webapiSettingsGet(
QString& errorMessage __attribute__((unused)))
{
response.setHackRfOutputSettings(new SWGSDRangel::SWGHackRFOutputSettings());
response.getHackRfOutputSettings()->init();
webapiFormatDeviceSettings(response, m_settings);
return 200;
}

View File

@ -1111,6 +1111,7 @@ int LimeSDROutput::webapiSettingsGet(
QString& errorMessage __attribute__((unused)))
{
response.setLimeSdrOutputSettings(new SWGSDRangel::SWGLimeSdrOutputSettings());
response.getLimeSdrOutputSettings()->init();
webapiFormatDeviceSettings(response, m_settings);
return 200;
}

View File

@ -353,7 +353,7 @@ int FileSourceInput::webapiSettingsGet(
QString& errorMessage __attribute__((unused)))
{
response.setFileSourceSettings(new SWGSDRangel::SWGFileSourceSettings());
*response.getFileSourceSettings()->getFileName() = m_settings.m_fileName;
response.getFileSourceSettings()->setFileName(new QString(m_settings.m_fileName));
return 200;
}

View File

@ -553,6 +553,7 @@ int HackRFInput::webapiSettingsGet(
QString& errorMessage __attribute__((unused)))
{
response.setHackRfInputSettings(new SWGSDRangel::SWGHackRFInputSettings());
response.getHackRfInputSettings()->init();
webapiFormatDeviceSettings(response, m_settings);
return 200;
}

View File

@ -1265,6 +1265,7 @@ int LimeSDRInput::webapiSettingsGet(
QString& errorMessage __attribute__((unused)))
{
response.setLimeSdrInputSettings(new SWGSDRangel::SWGLimeSdrInputSettings());
response.getLimeSdrInputSettings()->init();
webapiFormatDeviceSettings(response, m_settings);
return 200;
}

View File

@ -554,6 +554,7 @@ int RTLSDRInput::webapiSettingsGet(
QString& errorMessage __attribute__((unused)))
{
response.setRtlSdrSettings(new SWGSDRangel::SWGRtlSdrSettings());
response.getRtlSdrSettings()->init();
webapiFormatDeviceSettings(response, m_settings);
return 200;
}