mirror of https://github.com/f4exb/sdrangel.git
DeviceSet: simplify channel registrations
This commit is contained in:
parent
99af2d8ad7
commit
7c506f361e
|
@ -29,11 +29,6 @@
|
||||||
#include "deviceset.h"
|
#include "deviceset.h"
|
||||||
|
|
||||||
|
|
||||||
DeviceSet::ChannelInstanceRegistration::ChannelInstanceRegistration(const QString& channelURI, ChannelAPI* channelAPI) :
|
|
||||||
m_channelURI(channelURI),
|
|
||||||
m_channelAPI(channelAPI)
|
|
||||||
{}
|
|
||||||
|
|
||||||
DeviceSet::DeviceSet(int tabIndex, int deviceType)
|
DeviceSet::DeviceSet(int tabIndex, int deviceType)
|
||||||
{
|
{
|
||||||
(void) deviceType;
|
(void) deviceType;
|
||||||
|
@ -53,15 +48,15 @@ void DeviceSet::freeChannels()
|
||||||
{
|
{
|
||||||
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::freeChannels: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelURI));
|
qDebug("DeviceSet::freeChannels: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i]->getURI()));
|
||||||
m_channelInstanceRegistrations[i].m_channelAPI->destroy();
|
m_channelInstanceRegistrations[i]->destroy();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const ChannelAPI *DeviceSet::getChannelAt(int channelIndex) const
|
const ChannelAPI *DeviceSet::getChannelAt(int channelIndex) const
|
||||||
{
|
{
|
||||||
if ((channelIndex >= 0) && (channelIndex < m_channelInstanceRegistrations.size())) {
|
if ((channelIndex >= 0) && (channelIndex < m_channelInstanceRegistrations.size())) {
|
||||||
return m_channelInstanceRegistrations[channelIndex].m_channelAPI;
|
return m_channelInstanceRegistrations[channelIndex];
|
||||||
} else {
|
} else {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +65,7 @@ const ChannelAPI *DeviceSet::getChannelAt(int channelIndex) const
|
||||||
ChannelAPI *DeviceSet::getChannelAt(int channelIndex)
|
ChannelAPI *DeviceSet::getChannelAt(int channelIndex)
|
||||||
{
|
{
|
||||||
if ((channelIndex >= 0) && (channelIndex < m_channelInstanceRegistrations.size())) {
|
if ((channelIndex >= 0) && (channelIndex < m_channelInstanceRegistrations.size())) {
|
||||||
return m_channelInstanceRegistrations[channelIndex].m_channelAPI;
|
return m_channelInstanceRegistrations[channelIndex];
|
||||||
} else {
|
} else {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
@ -80,7 +75,7 @@ void DeviceSet::deleteChannel(int channelIndex)
|
||||||
{
|
{
|
||||||
if (channelIndex < m_channelInstanceRegistrations.count())
|
if (channelIndex < m_channelInstanceRegistrations.count())
|
||||||
{
|
{
|
||||||
m_channelInstanceRegistrations[channelIndex].m_channelAPI->destroy();
|
m_channelInstanceRegistrations[channelIndex]->destroy();
|
||||||
m_channelInstanceRegistrations.removeAt(channelIndex);
|
m_channelInstanceRegistrations.removeAt(channelIndex);
|
||||||
renameChannelInstances();
|
renameChannelInstances();
|
||||||
}
|
}
|
||||||
|
@ -91,7 +86,7 @@ void DeviceSet::addRxChannel(int selectedChannelIndex, PluginAPI *pluginAPI)
|
||||||
PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getRxChannelRegistrations(); // Available channel plugins
|
PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getRxChannelRegistrations(); // Available channel plugins
|
||||||
ChannelAPI *rxChannel;
|
ChannelAPI *rxChannel;
|
||||||
(*channelRegistrations)[selectedChannelIndex].m_plugin->createRxChannel(m_deviceAPI, nullptr, &rxChannel);
|
(*channelRegistrations)[selectedChannelIndex].m_plugin->createRxChannel(m_deviceAPI, nullptr, &rxChannel);
|
||||||
ChannelInstanceRegistration reg = ChannelInstanceRegistration(rxChannel->getName(), rxChannel);
|
ChannelAPI *reg = rxChannel;
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(reg);
|
||||||
qDebug("DeviceSet::addRxChannel: %s", qPrintable(rxChannel->getName()));
|
qDebug("DeviceSet::addRxChannel: %s", qPrintable(rxChannel->getName()));
|
||||||
}
|
}
|
||||||
|
@ -101,7 +96,7 @@ void DeviceSet::addTxChannel(int selectedChannelIndex, PluginAPI *pluginAPI)
|
||||||
PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getTxChannelRegistrations(); // Available channel plugins
|
PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getTxChannelRegistrations(); // Available channel plugins
|
||||||
ChannelAPI *txChannel;
|
ChannelAPI *txChannel;
|
||||||
(*channelRegistrations)[selectedChannelIndex].m_plugin->createTxChannel(m_deviceAPI, nullptr, &txChannel);
|
(*channelRegistrations)[selectedChannelIndex].m_plugin->createTxChannel(m_deviceAPI, nullptr, &txChannel);
|
||||||
ChannelInstanceRegistration reg = ChannelInstanceRegistration(txChannel->getName(), txChannel);
|
ChannelAPI *reg = txChannel;
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(reg);
|
||||||
qDebug("DeviceSet::addTxChannel: %s", qPrintable(txChannel->getName()));
|
qDebug("DeviceSet::addTxChannel: %s", qPrintable(txChannel->getName()));
|
||||||
}
|
}
|
||||||
|
@ -111,7 +106,7 @@ void DeviceSet::addMIMOChannel(int selectedChannelIndex, PluginAPI *pluginAPI)
|
||||||
PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getMIMOChannelRegistrations(); // Available channel plugins
|
PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getMIMOChannelRegistrations(); // Available channel plugins
|
||||||
ChannelAPI *mimoChannel;
|
ChannelAPI *mimoChannel;
|
||||||
(*channelRegistrations)[selectedChannelIndex].m_plugin->createMIMOChannel(m_deviceAPI, nullptr, &mimoChannel);
|
(*channelRegistrations)[selectedChannelIndex].m_plugin->createMIMOChannel(m_deviceAPI, nullptr, &mimoChannel);
|
||||||
ChannelInstanceRegistration reg = ChannelInstanceRegistration(mimoChannel->getName(), mimoChannel);
|
ChannelAPI *reg = mimoChannel;
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(reg);
|
||||||
qDebug("DeviceSet::addMIMOChannel: %s", qPrintable(mimoChannel->getName()));
|
qDebug("DeviceSet::addMIMOChannel: %s", qPrintable(mimoChannel->getName()));
|
||||||
}
|
}
|
||||||
|
@ -134,27 +129,28 @@ void DeviceSet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginAPI
|
||||||
for (int i = 0; i < preset->getChannelCount(); i++)
|
for (int i = 0; i < preset->getChannelCount(); i++)
|
||||||
{
|
{
|
||||||
const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i);
|
const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i);
|
||||||
ChannelInstanceRegistration reg;
|
ChannelAPI *channelAPI;
|
||||||
|
|
||||||
// if we have one instance available already, use it
|
// if we have one instance available already, use it
|
||||||
|
|
||||||
for (int i = 0; i < openChannels.count(); i++)
|
for (int i = 0; i < openChannels.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadChannelSettings: channels compare [%s] vs [%s]", qPrintable(openChannels[i].m_channelURI), qPrintable(channelConfig.m_channelIdURI));
|
qDebug("DeviceSet::loadChannelSettings: channels compare [%s] vs [%s]",
|
||||||
|
qPrintable(openChannels[i]->getURI()), qPrintable(channelConfig.m_channelIdURI));
|
||||||
|
|
||||||
//if(openChannels[i].m_channelName == channelConfig.m_channelIdURI)
|
//if(openChannels[i].m_channelName == channelConfig.m_channelIdURI)
|
||||||
if (ChannelUtils::compareChannelURIs(openChannels[i].m_channelURI, channelConfig.m_channelIdURI))
|
if (ChannelUtils::compareChannelURIs(openChannels[i]->getURI(), channelConfig.m_channelIdURI))
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadChannelSettings: channel [%s] found", qPrintable(openChannels[i].m_channelURI));
|
qDebug("DeviceSet::loadChannelSettings: channel [%s] found", qPrintable(openChannels[i]->getURI()));
|
||||||
reg = openChannels.takeAt(i);
|
channelAPI = openChannels.takeAt(i);
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(channelAPI);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we haven't one already, create one
|
// if we haven't one already, create one
|
||||||
|
|
||||||
if (reg.m_channelAPI == nullptr)
|
if (!channelAPI)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < channelRegistrations->count(); i++)
|
for (int i = 0; i < channelRegistrations->count(); i++)
|
||||||
{
|
{
|
||||||
|
@ -166,25 +162,25 @@ void DeviceSet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginAPI
|
||||||
qPrintable(channelConfig.m_channelIdURI));
|
qPrintable(channelConfig.m_channelIdURI));
|
||||||
ChannelAPI *rxChannel;
|
ChannelAPI *rxChannel;
|
||||||
(*channelRegistrations)[i].m_plugin->createRxChannel(m_deviceAPI, nullptr, &rxChannel);
|
(*channelRegistrations)[i].m_plugin->createRxChannel(m_deviceAPI, nullptr, &rxChannel);
|
||||||
reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, rxChannel);
|
channelAPI = rxChannel;
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(channelAPI);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reg.m_channelAPI != nullptr)
|
if (channelAPI)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadChannelSettings: deserializing channel [%s]", qPrintable(channelConfig.m_channelIdURI));
|
qDebug("DeviceSet::loadChannelSettings: deserializing channel [%s]", qPrintable(channelConfig.m_channelIdURI));
|
||||||
reg.m_channelAPI->deserialize(channelConfig.m_config);
|
channelAPI->deserialize(channelConfig.m_config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// everything, that is still "available" is not needed anymore
|
// everything, that is still "available" is not needed anymore
|
||||||
for (int i = 0; i < openChannels.count(); i++)
|
for (int i = 0; i < openChannels.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadChannelSettings: destroying spare channel [%s]", qPrintable(openChannels[i].m_channelURI));
|
qDebug("DeviceSet::loadChannelSettings: destroying spare channel [%s]", qPrintable(openChannels[i]->getURI()));
|
||||||
openChannels[i].m_channelAPI->destroy();
|
openChannels[i]->destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
renameChannelInstances();
|
renameChannelInstances();
|
||||||
|
@ -199,12 +195,13 @@ void DeviceSet::saveRxChannelSettings(Preset *preset)
|
||||||
{
|
{
|
||||||
if (preset->isSourcePreset())
|
if (preset->isSourcePreset())
|
||||||
{
|
{
|
||||||
std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end()); // sort by increasing delta frequency and type
|
// sort by increasing delta frequency and type
|
||||||
|
std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end(), compareChannels);
|
||||||
|
|
||||||
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::saveChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i].m_channelURI));
|
qDebug("DeviceSet::saveChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i]->getURI()));
|
||||||
preset->addChannel(m_channelInstanceRegistrations[i].m_channelURI, m_channelInstanceRegistrations[i].m_channelAPI->serialize());
|
preset->addChannel(m_channelInstanceRegistrations[i]->getURI(), m_channelInstanceRegistrations[i]->serialize());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -231,26 +228,27 @@ void DeviceSet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginAPI
|
||||||
for (int i = 0; i < preset->getChannelCount(); i++)
|
for (int i = 0; i < preset->getChannelCount(); i++)
|
||||||
{
|
{
|
||||||
const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i);
|
const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i);
|
||||||
ChannelInstanceRegistration reg;
|
ChannelAPI *channelAPI;
|
||||||
|
|
||||||
// if we have one instance available already, use it
|
// if we have one instance available already, use it
|
||||||
|
|
||||||
for (int i = 0; i < openChannels.count(); i++)
|
for (int i = 0; i < openChannels.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadTxChannelSettings: channels compare [%s] vs [%s]", qPrintable(openChannels[i].m_channelURI), qPrintable(channelConfig.m_channelIdURI));
|
qDebug("DeviceSet::loadTxChannelSettings: channels compare [%s] vs [%s]",
|
||||||
|
qPrintable(openChannels[i]->getURI()), qPrintable(channelConfig.m_channelIdURI));
|
||||||
|
|
||||||
if (openChannels[i].m_channelURI == channelConfig.m_channelIdURI)
|
if (openChannels[i]->getURI() == channelConfig.m_channelIdURI)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadTxChannelSettings: channel [%s] found", qPrintable(openChannels[i].m_channelURI));
|
qDebug("DeviceSet::loadTxChannelSettings: channel [%s] found", qPrintable(openChannels[i]->getURI()));
|
||||||
reg = openChannels.takeAt(i);
|
channelAPI = openChannels.takeAt(i);
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(channelAPI);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we haven't one already, create one
|
// if we haven't one already, create one
|
||||||
|
|
||||||
if (reg.m_channelAPI == nullptr)
|
if (!channelAPI)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < channelRegistrations->count(); i++)
|
for (int i = 0; i < channelRegistrations->count(); i++)
|
||||||
{
|
{
|
||||||
|
@ -259,32 +257,33 @@ void DeviceSet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginAPI
|
||||||
qDebug("DeviceSet::loadTxChannelSettings: creating new channel [%s]", qPrintable(channelConfig.m_channelIdURI));
|
qDebug("DeviceSet::loadTxChannelSettings: creating new channel [%s]", qPrintable(channelConfig.m_channelIdURI));
|
||||||
ChannelAPI *txChannel;
|
ChannelAPI *txChannel;
|
||||||
(*channelRegistrations)[i].m_plugin->createTxChannel(m_deviceAPI, nullptr, &txChannel);
|
(*channelRegistrations)[i].m_plugin->createTxChannel(m_deviceAPI, nullptr, &txChannel);
|
||||||
reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, txChannel);
|
channelAPI = txChannel;
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(channelAPI);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reg.m_channelAPI != nullptr)
|
if (channelAPI)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadTxChannelSettings: deserializing channel [%s]", qPrintable(channelConfig.m_channelIdURI));
|
qDebug("DeviceSet::loadTxChannelSettings: deserializing channel [%s]", qPrintable(channelConfig.m_channelIdURI));
|
||||||
reg.m_channelAPI->deserialize(channelConfig.m_config);
|
channelAPI->deserialize(channelConfig.m_config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// everything, that is still "available" is not needed anymore
|
// everything, that is still "available" is not needed anymore
|
||||||
for (int i = 0; i < openChannels.count(); i++)
|
for (int i = 0; i < openChannels.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadTxChannelSettings: destroying spare channel [%s]", qPrintable(openChannels[i].m_channelURI));
|
qDebug("DeviceSet::loadTxChannelSettings: destroying spare channel [%s]", qPrintable(openChannels[i]->getURI()));
|
||||||
openChannels[i].m_channelAPI->destroy();
|
openChannels[i]->destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
renameChannelInstances();
|
renameChannelInstances();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadTxChannelSettings: Loading preset [%s | %s] not a sink preset", qPrintable(preset->getGroup()), qPrintable(preset->getDescription()));
|
qDebug("DeviceSet::loadTxChannelSettings: Loading preset [%s | %s] not a sink preset",
|
||||||
|
qPrintable(preset->getGroup()), qPrintable(preset->getDescription()));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -293,12 +292,13 @@ void DeviceSet::saveTxChannelSettings(Preset *preset)
|
||||||
{
|
{
|
||||||
if (preset->isSinkPreset())
|
if (preset->isSinkPreset())
|
||||||
{
|
{
|
||||||
std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end()); // sort by increasing delta frequency and type
|
// sort by increasing delta frequency and type
|
||||||
|
std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end(), compareChannels);
|
||||||
|
|
||||||
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::saveTxChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i].m_channelURI));
|
qDebug("DeviceSet::saveTxChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i]->getURI()));
|
||||||
preset->addChannel(m_channelInstanceRegistrations[i].m_channelURI, m_channelInstanceRegistrations[i].m_channelAPI->serialize());
|
preset->addChannel(m_channelInstanceRegistrations[i]->getURI(), m_channelInstanceRegistrations[i]->serialize());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -325,27 +325,28 @@ void DeviceSet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *pluginA
|
||||||
for (int i = 0; i < preset->getChannelCount(); i++)
|
for (int i = 0; i < preset->getChannelCount(); i++)
|
||||||
{
|
{
|
||||||
const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i);
|
const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i);
|
||||||
ChannelInstanceRegistration reg;
|
ChannelAPI *channelAPI;
|
||||||
|
|
||||||
// if we have one instance available already, use it
|
// if we have one instance available already, use it
|
||||||
|
|
||||||
for (int i = 0; i < openChannels.count(); i++)
|
for (int i = 0; i < openChannels.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadMIMOChannelSettings: channels compare [%s] vs [%s]", qPrintable(openChannels[i].m_channelURI), qPrintable(channelConfig.m_channelIdURI));
|
qDebug("DeviceSet::loadMIMOChannelSettings: channels compare [%s] vs [%s]",
|
||||||
|
qPrintable(openChannels[i]->getURI()), qPrintable(channelConfig.m_channelIdURI));
|
||||||
|
|
||||||
//if(openChannels[i].m_channelName == channelConfig.m_channelIdURI)
|
//if(openChannels[i].m_channelName == channelConfig.m_channelIdURI)
|
||||||
if (ChannelUtils::compareChannelURIs(openChannels[i].m_channelURI, channelConfig.m_channelIdURI))
|
if (ChannelUtils::compareChannelURIs(openChannels[i]->getURI(), channelConfig.m_channelIdURI))
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadMIMOChannelSettings: channel [%s] found", qPrintable(openChannels[i].m_channelURI));
|
qDebug("DeviceSet::loadMIMOChannelSettings: channel [%s] found", qPrintable(openChannels[i]->getURI()));
|
||||||
reg = openChannels.takeAt(i);
|
channelAPI = openChannels.takeAt(i);
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(channelAPI);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if we haven't one already, create one
|
// if we haven't one already, create one
|
||||||
|
|
||||||
if (reg.m_channelAPI == nullptr)
|
if (!channelAPI)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < channelRegistrations->count(); i++)
|
for (int i = 0; i < channelRegistrations->count(); i++)
|
||||||
{
|
{
|
||||||
|
@ -357,25 +358,25 @@ void DeviceSet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *pluginA
|
||||||
qPrintable(channelConfig.m_channelIdURI));
|
qPrintable(channelConfig.m_channelIdURI));
|
||||||
ChannelAPI *mimoChannel;
|
ChannelAPI *mimoChannel;
|
||||||
(*channelRegistrations)[i].m_plugin->createMIMOChannel(m_deviceAPI, nullptr, &mimoChannel);
|
(*channelRegistrations)[i].m_plugin->createMIMOChannel(m_deviceAPI, nullptr, &mimoChannel);
|
||||||
reg = ChannelInstanceRegistration(channelConfig.m_channelIdURI, mimoChannel);
|
channelAPI = mimoChannel;
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(channelAPI);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reg.m_channelAPI != nullptr)
|
if (channelAPI)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadMIMOChannelSettings: deserializing channel [%s]", qPrintable(channelConfig.m_channelIdURI));
|
qDebug("DeviceSet::loadMIMOChannelSettings: deserializing channel [%s]", qPrintable(channelConfig.m_channelIdURI));
|
||||||
reg.m_channelAPI->deserialize(channelConfig.m_config);
|
channelAPI->deserialize(channelConfig.m_config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// everything, that is still "available" is not needed anymore
|
// everything, that is still "available" is not needed anymore
|
||||||
for (int i = 0; i < openChannels.count(); i++)
|
for (int i = 0; i < openChannels.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::loadMIMOChannelSettings: destroying spare channel [%s]", qPrintable(openChannels[i].m_channelURI));
|
qDebug("DeviceSet::loadMIMOChannelSettings: destroying spare channel [%s]", qPrintable(openChannels[i]->getURI()));
|
||||||
openChannels[i].m_channelAPI->destroy();
|
openChannels[i]->destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
renameChannelInstances();
|
renameChannelInstances();
|
||||||
|
@ -390,12 +391,13 @@ void DeviceSet::saveMIMOChannelSettings(Preset *preset)
|
||||||
{
|
{
|
||||||
if (preset->isMIMOPreset())
|
if (preset->isMIMOPreset())
|
||||||
{
|
{
|
||||||
std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end()); // sort by increasing delta frequency and type
|
// sort by increasing delta frequency and type
|
||||||
|
std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end(), compareChannels);
|
||||||
|
|
||||||
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
||||||
{
|
{
|
||||||
qDebug("DeviceSet::saveMIMOChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i].m_channelURI));
|
qDebug("DeviceSet::saveMIMOChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i]->getURI()));
|
||||||
preset->addChannel(m_channelInstanceRegistrations[i].m_channelURI, m_channelInstanceRegistrations[i].m_channelAPI->serialize());
|
preset->addChannel(m_channelInstanceRegistrations[i]->getURI(), m_channelInstanceRegistrations[i]->serialize());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -406,24 +408,20 @@ void DeviceSet::saveMIMOChannelSettings(Preset *preset)
|
||||||
|
|
||||||
void DeviceSet::renameChannelInstances()
|
void DeviceSet::renameChannelInstances()
|
||||||
{
|
{
|
||||||
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++) {
|
||||||
{
|
m_channelInstanceRegistrations[i]->setName(QString("%1:%2").arg(m_channelInstanceRegistrations[i]->getURI()).arg(i));
|
||||||
m_channelInstanceRegistrations[i].m_channelAPI->setName(QString("%1:%2").arg(m_channelInstanceRegistrations[i].m_channelURI).arg(i));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// sort by increasing delta frequency and type (i.e. name)
|
// sort by increasing delta frequency and type (i.e. name)
|
||||||
bool DeviceSet::ChannelInstanceRegistration::operator<(const ChannelInstanceRegistration& other) const
|
bool DeviceSet::compareChannels(const ChannelAPI *channelA, const ChannelAPI *channelB)
|
||||||
{
|
{
|
||||||
if (m_channelAPI && other.m_channelAPI)
|
if (channelA && channelB)
|
||||||
{
|
{
|
||||||
if (m_channelAPI->getCenterFrequency() == other.m_channelAPI->getCenterFrequency())
|
if (channelA->getCenterFrequency() == channelB->getCenterFrequency()) {
|
||||||
{
|
return channelA->getName() < channelB->getName();
|
||||||
return m_channelAPI->getName() < other.m_channelAPI->getName();
|
} else {
|
||||||
}
|
return channelA->getCenterFrequency() < channelB->getCenterFrequency();
|
||||||
else
|
|
||||||
{
|
|
||||||
return m_channelAPI->getCenterFrequency() < other.m_channelAPI->getCenterFrequency();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -434,8 +432,8 @@ bool DeviceSet::ChannelInstanceRegistration::operator<(const ChannelInstanceRegi
|
||||||
|
|
||||||
void DeviceSet::addChannelInstance(const QString& channelURI, ChannelAPI *channelAPI)
|
void DeviceSet::addChannelInstance(const QString& channelURI, ChannelAPI *channelAPI)
|
||||||
{
|
{
|
||||||
ChannelInstanceRegistration reg = ChannelInstanceRegistration(channelURI, channelAPI);
|
(void) channelURI;
|
||||||
m_channelInstanceRegistrations.append(reg);
|
m_channelInstanceRegistrations.append(channelAPI);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeviceSet::removeChannelInstanceAt(int index)
|
void DeviceSet::removeChannelInstanceAt(int index)
|
||||||
|
@ -449,7 +447,7 @@ void DeviceSet::removeChannelInstance(ChannelAPI *channelAPI)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
for (int i = 0; i < m_channelInstanceRegistrations.count(); i++)
|
||||||
{
|
{
|
||||||
if (m_channelInstanceRegistrations.at(i).m_channelAPI == channelAPI)
|
if (m_channelInstanceRegistrations.at(i) == channelAPI)
|
||||||
{
|
{
|
||||||
m_channelInstanceRegistrations.removeAt(i);
|
m_channelInstanceRegistrations.removeAt(i);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -62,32 +62,13 @@ public:
|
||||||
void clearChannels();
|
void clearChannels();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct ChannelInstanceRegistration
|
typedef QList<ChannelAPI*> ChannelInstanceRegistrations;
|
||||||
{
|
|
||||||
QString m_channelURI;
|
|
||||||
ChannelAPI *m_channelAPI;
|
|
||||||
|
|
||||||
ChannelInstanceRegistration() :
|
|
||||||
m_channelURI(),
|
|
||||||
m_channelAPI(nullptr)
|
|
||||||
{ }
|
|
||||||
|
|
||||||
ChannelInstanceRegistration(const QString& channelURI, ChannelAPI* channelAPI);
|
|
||||||
|
|
||||||
ChannelInstanceRegistration(const ChannelInstanceRegistration& other) :
|
|
||||||
m_channelURI(other.m_channelURI),
|
|
||||||
m_channelAPI(other.m_channelAPI)
|
|
||||||
{ }
|
|
||||||
|
|
||||||
bool operator<(const ChannelInstanceRegistration& other) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations;
|
|
||||||
|
|
||||||
ChannelInstanceRegistrations m_channelInstanceRegistrations;
|
ChannelInstanceRegistrations m_channelInstanceRegistrations;
|
||||||
int m_deviceTabIndex;
|
int m_deviceTabIndex;
|
||||||
|
|
||||||
void renameChannelInstances();
|
void renameChannelInstances();
|
||||||
|
static bool compareChannels(const ChannelAPI *channelA, const ChannelAPI *channelB);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* SDRSRV_DEVICE_DEVICESET_H_ */
|
#endif /* SDRSRV_DEVICE_DEVICESET_H_ */
|
||||||
|
|
Loading…
Reference in New Issue