mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-17 23:28:50 -05:00
Merge d516e9529d
into 067324edd9
This commit is contained in:
commit
eacb09cfa0
@ -578,8 +578,8 @@ void MainServer::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex)
|
|||||||
// wait for sample source to be set, before loading settings
|
// wait for sample source to be set, before loading settings
|
||||||
auto connection = new QMetaObject::Connection();
|
auto connection = new QMetaObject::Connection();
|
||||||
*connection = connect(
|
*connection = connect(
|
||||||
deviceSet->m_deviceSourceEngine,
|
deviceSet->m_deviceSinkEngine,
|
||||||
&DSPDeviceSourceEngine::sampleSet,
|
&DSPDeviceSinkEngine::sampleSet,
|
||||||
this,
|
this,
|
||||||
[=]() {
|
[=]() {
|
||||||
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings
|
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings
|
||||||
@ -644,8 +644,8 @@ void MainServer::changeSampleMIMO(int deviceSetIndex, int selectedDeviceIndex)
|
|||||||
// wait for sample source to be set, before loading settings
|
// wait for sample source to be set, before loading settings
|
||||||
auto connection = new QMetaObject::Connection();
|
auto connection = new QMetaObject::Connection();
|
||||||
*connection = connect(
|
*connection = connect(
|
||||||
deviceSet->m_deviceSourceEngine,
|
deviceSet->m_deviceMIMOEngine,
|
||||||
&DSPDeviceSourceEngine::sampleSet,
|
&DSPDeviceMIMOEngine::sampleSet,
|
||||||
this,
|
this,
|
||||||
[=]() {
|
[=]() {
|
||||||
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings
|
deviceSet->m_deviceAPI->loadSamplingDeviceSettings(m_mainCore->m_settings.getWorkingPreset()); // load new API settings
|
||||||
|
Loading…
Reference in New Issue
Block a user