VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-05 10:25:32 -04:00
Code Issues Projects Releases Wiki Activity

REST API: config: ATV modulator: added missing webapiUpdateChannelSettings implementation

Browse Source
This commit is contained in:
f4exb 2019-08-12 13:21:00 +02:00
parent 895f196fa5
commit 0d65f00983
1 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
plugins/channeltx/modatv/atvmod.cpp
View File

@ -1291,12 +1291,64 @@ int ATVMod::webapiSettingsPutPatch(
{ {
(void) errorMessage; (void) errorMessage;
ATVModSettings settings = m_settings; ATVModSettings settings = m_settings;
bool frequencyOffsetChanged = false; webapiUpdateChannelSettings(settings, channelSettingsKeys, response);
if (channelSettingsKeys.contains("inputFrequencyOffset")) if (m_settings.m_inputFrequencyOffset != settings.m_inputFrequencyOffset)
{ {
ATVMod::MsgConfigureChannelizer *msgChan = ATVMod::MsgConfigureChannelizer::create(
settings.m_inputFrequencyOffset);
m_inputMessageQueue.push(msgChan);
}
MsgConfigureATVMod *msg = MsgConfigureATVMod::create(settings, force);
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureATVMod *msgToGUI = MsgConfigureATVMod::create(settings, force);
m_guiMessageQueue->push(msgToGUI);
}
if (channelSettingsKeys.contains("imageFileName"))
{
MsgConfigureImageFileName *msg = MsgConfigureImageFileName::create(
*response.getAtvModSettings()->getImageFileName());
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureImageFileName *msgToGUI = MsgConfigureImageFileName::create(
*response.getAtvModSettings()->getImageFileName());
m_guiMessageQueue->push(msgToGUI);
}
}
if (channelSettingsKeys.contains("videoFileName"))
{
MsgConfigureVideoFileName *msg = MsgConfigureVideoFileName::create(
*response.getAtvModSettings()->getVideoFileName());
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureVideoFileName *msgToGUI = MsgConfigureVideoFileName::create(
*response.getAtvModSettings()->getVideoFileName());
m_guiMessageQueue->push(msgToGUI);
}
}
webapiFormatChannelSettings(response, settings);
return 200;
}
void ATVMod::webapiUpdateChannelSettings(
ATVModSettings& settings,
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response)
{
if (channelSettingsKeys.contains("inputFrequencyOffset")) {
settings.m_inputFrequencyOffset = response.getAtvModSettings()->getInputFrequencyOffset(); settings.m_inputFrequencyOffset = response.getAtvModSettings()->getInputFrequencyOffset();
frequencyOffsetChanged = true;
} }
if (channelSettingsKeys.contains("rfBandwidth")) { if (channelSettingsKeys.contains("rfBandwidth")) {
settings.m_rfBandwidth = response.getAtvModSettings()->getRfBandwidth(); settings.m_rfBandwidth = response.getAtvModSettings()->getRfBandwidth();
@ -1373,53 +1425,6 @@ int ATVMod::webapiSettingsPutPatch(
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getAtvModSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getAtvModSettings()->getReverseApiChannelIndex();
} }
if (frequencyOffsetChanged)
{
ATVMod::MsgConfigureChannelizer *msgChan = ATVMod::MsgConfigureChannelizer::create(
settings.m_inputFrequencyOffset);
m_inputMessageQueue.push(msgChan);
}
MsgConfigureATVMod *msg = MsgConfigureATVMod::create(settings, force);
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureATVMod *msgToGUI = MsgConfigureATVMod::create(settings, force);
m_guiMessageQueue->push(msgToGUI);
}
if (channelSettingsKeys.contains("imageFileName"))
{
MsgConfigureImageFileName *msg = MsgConfigureImageFileName::create(
*response.getAtvModSettings()->getImageFileName());
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureImageFileName *msgToGUI = MsgConfigureImageFileName::create(
*response.getAtvModSettings()->getImageFileName());
m_guiMessageQueue->push(msgToGUI);
}
}
if (channelSettingsKeys.contains("videoFileName"))
{
MsgConfigureVideoFileName *msg = MsgConfigureVideoFileName::create(
*response.getAtvModSettings()->getVideoFileName());
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureVideoFileName *msgToGUI = MsgConfigureVideoFileName::create(
*response.getAtvModSettings()->getVideoFileName());
m_guiMessageQueue->push(msgToGUI);
}
}
webapiFormatChannelSettings(response, settings);
return 200;
} }
int ATVMod::webapiReportGet( int ATVMod::webapiReportGet(