VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 08:54:49 -04:00
Code Issues Projects Releases Wiki Activity

Separate construction/destruction for the sink output plugin core and the GUI

Browse Source
This commit is contained in:
f4exb
2017-09-16 11:34:25 +02:00
parent 1d4cb21bb5
commit 9dd99a4530
22 changed files with 143 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/device/devicesinkapi.cpp
+12 -18
View File
@@ -83,11 +83,16 @@ uint32_t DeviceSinkAPI::getNumberOfSources()
return m_deviceSinkEngine->getNumberOfSources();
}
void DeviceSinkAPI::setSink(DeviceSampleSink* sink)
void DeviceSinkAPI::setSampleSink(DeviceSampleSink* sink)
{
m_deviceSinkEngine->setSink(sink);
}
DeviceSampleSink *DeviceSinkAPI::getSampleSink()
{
return m_deviceSinkEngine->getSink();
}
bool DeviceSinkAPI::initGeneration()
{
return m_deviceSinkEngine->initGeneration();
@@ -157,6 +162,11 @@ void DeviceSinkAPI::setSampleSinkId(const QString& id)
m_sampleSinkId = id;
}
void DeviceSinkAPI::resetSampleSinkId()
{
m_sampleSinkId.clear();
}
void DeviceSinkAPI::setSampleSinkSerial(const QString& serial)
{
m_sampleSinkSerial = serial;
@@ -180,12 +190,6 @@ void DeviceSinkAPI::setSampleSinkPluginInterface(PluginInterface *iface)
void DeviceSinkAPI::setSampleSinkPluginInstanceUI(PluginInstanceUI *gui)
{
if (m_sampleSinkPluginInstanceUI != 0)
{
m_sampleSinkPluginInstanceUI->destroy();
m_sampleSinkId.clear();
}
m_sampleSinkPluginInstanceUI = gui;
}
@@ -217,23 +221,13 @@ void DeviceSinkAPI::renameChannelInstances()
}
}
void DeviceSinkAPI::freeAll()
void DeviceSinkAPI::freeChannels()
{
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{
qDebug("DeviceSinkAPI::freeAll: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelName));
m_channelInstanceRegistrations[i].m_gui->destroy();
}
if(m_sampleSinkPluginInstanceUI != 0)
{
qDebug("DeviceSinkAPI::freeAll: destroying m_sampleSourcePluginGUI");
m_deviceSinkEngine->setSink(0);
m_sampleSinkPluginInstanceUI->destroy();
m_sampleSinkPluginInstanceUI = 0;
m_sampleSinkId.clear();
}
}
void DeviceSinkAPI::loadSinkSettings(const Preset* preset)