VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-04-04 02:28:33 -04:00
Code Issues Projects Releases Wiki Activity

Fixed re-enumeration of static devices

Browse Source
This commit is contained in:
f4exb 2017-05-18 22:54:24 +02:00
parent 9d9aa64439
commit c434b2e24e
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdrbase/mainwindow.cpp
View File

@ -990,7 +990,9 @@ void MainWindow::on_action_reloadDevices_triggered()
{
QComboBox *deviceSelectorComboBox = (*it)->m_samplingDeviceControl->getDeviceSelector();
bool sampleSourceSignalsBlocked = deviceSelectorComboBox->blockSignals(true);
m_pluginManager->fillSampleSourceSelector(deviceSelectorComboBox, (*it)->m_deviceSourceEngine->getUID());
uint dspDeviceSourceEngineUID = (*it)->m_deviceSourceEngine->getUID();
m_pluginManager->duplicateLocalSampleSourceDevices(dspDeviceSourceEngineUID);
m_pluginManager->fillSampleSourceSelector(deviceSelectorComboBox, dspDeviceSourceEngineUID);
int newIndex = m_pluginManager->getSampleSourceSelectorIndex(deviceSelectorComboBox, (*it)->m_deviceSourceAPI);
deviceSelectorComboBox->setCurrentIndex(newIndex);
deviceSelectorComboBox->blockSignals(sampleSourceSignalsBlocked);
@ -1000,7 +1002,9 @@ void MainWindow::on_action_reloadDevices_triggered()
{
QComboBox *deviceSelectorComboBox = (*it)->m_samplingDeviceControl->getDeviceSelector();
bool sampleSinkSignalsBlocked = deviceSelectorComboBox->blockSignals(true);
m_pluginManager->fillSampleSinkSelector(deviceSelectorComboBox, (*it)->m_deviceSinkEngine->getUID());
uint dspDeviceSinkEngineUID = (*it)->m_deviceSinkEngine->getUID();
m_pluginManager->duplicateLocalSampleSinkDevices(dspDeviceSinkEngineUID);
m_pluginManager->fillSampleSinkSelector(deviceSelectorComboBox, dspDeviceSinkEngineUID);
int newIndex = m_pluginManager->getSampleSinkSelectorIndex(deviceSelectorComboBox, (*it)->m_deviceSinkAPI);
deviceSelectorComboBox->setCurrentIndex(newIndex);
deviceSelectorComboBox->blockSignals(sampleSinkSignalsBlocked);

12
sdrbase/plugin/pluginmanager.cpp
View File

@ -127,6 +127,12 @@ void PluginManager::updateSampleSourceDevices()
ssd[j].id,
ssd[j].serial,
ssd[j].sequence));
qDebug("PluginManager::updateSampleSourceDevices: %s %s %s %s %d",
qPrintable(ssd[j].displayedName),
qPrintable(ssd[j].hardwareId),
qPrintable(ssd[j].id),
qPrintable(ssd[j].serial),
ssd[j].sequence);
}
}
}
@ -147,6 +153,12 @@ void PluginManager::updateSampleSinkDevices()
ssd[j].id,
ssd[j].serial,
ssd[j].sequence));
qDebug("PluginManager::updateSampleSinkDevices: %s %s %s %s %d",
qPrintable(ssd[j].displayedName),
qPrintable(ssd[j].hardwareId),
qPrintable(ssd[j].id),
qPrintable(ssd[j].serial),
ssd[j].sequence);
}
}
}