VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-22 01:20:56 -05:00
Code Issues Projects Releases Wiki Activity

Stop device while changing channel set. Fixes #2332

Browse Source
This commit is contained in:
Jon Beniston 2024-11-26 11:52:30 +00:00
parent 460ebfbeb2
commit 3c3e5cf3df
1 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sdrgui/device/deviceuiset.cpp
View File

@ -39,6 +39,7 @@
#include "channel/channelutils.h"
#include "channel/channelapi.h"
#include "channel/channelgui.h"
#include "channel/channelwebapiutils.h"
#include "mainspectrum/mainspectrumgui.h"
#include "settings/preset.h"
#include "util/simpleserializer.h"
@ -258,12 +259,47 @@ void DeviceUISet::loadDeviceSetSettings(
m_mainSpectrumGUI->hide();
}
if (m_deviceSourceEngine) { // source device
loadRxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceSinkEngine) { // sink device
loadTxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceMIMOEngine) { // MIMO device
loadMIMOChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
// Stop device while changing channels
if (m_deviceAPI->state() == DeviceAPI::EngineState::StRunning)
{
int deviceIndex = m_deviceAPI->getDeviceSetIndex();
// Load settings after stopping device
auto connection = new QMetaObject::Connection();
*connection = connect(m_deviceAPI, &DeviceAPI::stateChanged, this, [=]() {
if (m_deviceAPI->state() != DeviceAPI::EngineState::StRunning)
{
// Load channel settings
if (m_deviceSourceEngine) {
loadRxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceSinkEngine) {
loadTxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceMIMOEngine) {
loadMIMOChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
}
// Restart device
ChannelWebAPIUtils::run(deviceIndex);
QObject::disconnect(*connection);
delete connection;
}
});
// We use WebAPI rather than m_deviceAPI->stopDeviceEngine();
// so that the start/stop button in the Device GUI is correctly updated
ChannelWebAPIUtils::stop(deviceIndex);
}
else
{
// Load channel settings
if (m_deviceSourceEngine) {
loadRxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceSinkEngine) {
loadTxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceMIMOEngine) {
loadMIMOChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
}
}
}