Merge pull request #2304 from srcejon/freq_scanner

Server: Use Sink/MIMO signals rather than Source.
pull/2306/head^2
Edouard Griffiths 2024-11-02 08:53:11 +01:00 zatwierdzone przez GitHub
commit b122d40bce
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
1 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -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