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

Main server: wait for set sample source/sink/MIMO to complete before loading the device settings. For #2294

Browse Source
This commit is contained in:
f4exb 2024-11-01 10:32:39 +01:00
parent 618e234d6c
commit bd67d553ea
1 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sdrsrv/mainserver.cpp
View File

@ -495,11 +495,20 @@ void MainServer::changeSampleSource(int deviceSetIndex, int selectedDeviceIndex)
DeviceSampleSource *source = deviceSet->m_deviceAPI->getPluginInterface()->createSampleSourcePluginInstance( DeviceSampleSource *source = deviceSet->m_deviceAPI->getPluginInterface()->createSampleSourcePluginInstance(
deviceSet->m_deviceAPI->getSamplingDeviceId(), deviceSet->m_deviceAPI); deviceSet->m_deviceAPI->getSamplingDeviceId(), deviceSet->m_deviceAPI);
deviceSet->m_deviceAPI->setSampleSource(source); deviceSet->m_deviceAPI->setSampleSource(source);
// wait for sample source to be set, before loading settings
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings auto connection = new QMetaObject::Connection();
*connection = connect(
// Notify deviceSet->m_deviceSourceEngine,
emit m_mainCore->deviceChanged(deviceSetIndex); &DSPDeviceSourceEngine::sampleSet,
this,
[=]() {
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings
// Notify
emit m_mainCore->deviceChanged(deviceSetIndex);
QObject::disconnect(*connection);
delete connection;
}
);
} }
} }
@ -566,8 +575,20 @@ void MainServer::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex)
DeviceSampleSink *sink = deviceSet->m_deviceAPI->getPluginInterface()->createSampleSinkPluginInstance( DeviceSampleSink *sink = deviceSet->m_deviceAPI->getPluginInterface()->createSampleSinkPluginInstance(
deviceSet->m_deviceAPI->getSamplingDeviceId(), deviceSet->m_deviceAPI); deviceSet->m_deviceAPI->getSamplingDeviceId(), deviceSet->m_deviceAPI);
deviceSet->m_deviceAPI->setSampleSink(sink); deviceSet->m_deviceAPI->setSampleSink(sink);
// wait for sample source to be set, before loading settings
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings auto connection = new QMetaObject::Connection();
*connection = connect(
deviceSet->m_deviceSourceEngine,
&DSPDeviceSourceEngine::sampleSet,
this,
[=]() {
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings
// Notify
emit m_mainCore->deviceChanged(deviceSetIndex);
QObject::disconnect(*connection);
delete connection;
}
);
} }
} }
@ -620,8 +641,20 @@ void MainServer::changeSampleMIMO(int deviceSetIndex, int selectedDeviceIndex)
DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getPluginInterface()->createSampleMIMOPluginInstance( DeviceSampleMIMO *mimo = deviceSet->m_deviceAPI->getPluginInterface()->createSampleMIMOPluginInstance(
deviceSet->m_deviceAPI->getSamplingDeviceId(), deviceSet->m_deviceAPI); deviceSet->m_deviceAPI->getSamplingDeviceId(), deviceSet->m_deviceAPI);
deviceSet->m_deviceAPI->setSampleMIMO(mimo); deviceSet->m_deviceAPI->setSampleMIMO(mimo);
// wait for sample source to be set, before loading settings
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings auto connection = new QMetaObject::Connection();
*connection = connect(
deviceSet->m_deviceSourceEngine,
&DSPDeviceSourceEngine::sampleSet,
this,
[=]() {
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings
// Notify
emit m_mainCore->deviceChanged(deviceSetIndex);
QObject::disconnect(*connection);
delete connection;
}
);
} }
} }