1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 00:44:48 -04:00

Multi device support: code cleanup and fixed lock on exit

This commit is contained in:
f4exb
2016-05-17 00:04:27 +02:00
parent 3f2b3cdea3
commit 86b04a4d62
8 changed files with 46 additions and 302 deletions
+9 -8
View File
@@ -196,18 +196,19 @@ void DeviceAPI::freeAll()
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{
qDebug("PluginManager::loadSettings: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelName));
qDebug("DeviceAPI::freeAll: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelName));
m_channelInstanceRegistrations[i].m_gui->destroy();
}
// if(m_sampleSourcePluginGUI != 0)
// {
// m_deviceEngine->setSource(0);
// m_sampleSourcePluginGUI->destroy();
// m_sampleSourcePluginGUI = 0;
// m_sampleSourceId.clear();
// }
if(m_sampleSourcePluginGUI != 0)
{
qDebug("DeviceAPI::freeAll: destroying m_sampleSourcePluginGUI");
m_deviceEngine->setSource(0);
m_sampleSourcePluginGUI->destroy();
m_sampleSourcePluginGUI = 0;
m_sampleSourceId.clear();
}
}
void DeviceAPI::loadSourceSettings(const Preset* preset)