1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 13:47:01 -04:00

Multi device support: migrated channel registration objects to plugin API

This commit is contained in:
f4exb
2016-05-16 18:34:23 +02:00
parent a9cda881d6
commit 6840a20ab9
6 changed files with 33 additions and 16 deletions
+3 -3
View File
@@ -56,7 +56,7 @@ void PluginManager::loadPlugins()
void PluginManager::registerChannel(const QString& channelName, PluginInterface* plugin)
{
m_channelRegistrations.append(ChannelRegistration(channelName, plugin));
m_channelRegistrations.append(PluginAPI::ChannelRegistration(channelName, plugin));
}
void PluginManager::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)
@@ -85,7 +85,7 @@ void PluginManager::registerSampleSource(const QString& sourceName, PluginInterf
m_sampleSourceRegistrations.append(SampleSourceRegistration(sourceName, plugin));
}
void PluginManager::loadSettings(const Preset* preset, DeviceAPI *deviceAPI)
void PluginManager::loadChannelSettings(const Preset* preset, DeviceAPI *deviceAPI)
{
fprintf(stderr, "PluginManager::loadSettings: Loading preset [%s | %s]\n", qPrintable(preset->getGroup()), qPrintable(preset->getDescription()));
@@ -507,7 +507,7 @@ void PluginManager::renameChannelInstances()
void PluginManager::populateChannelComboBox(QComboBox *channels)
{
for(ChannelRegistrations::iterator it = m_channelRegistrations.begin(); it != m_channelRegistrations.end(); ++it)
for(PluginAPI::ChannelRegistrations::iterator it = m_channelRegistrations.begin(); it != m_channelRegistrations.end(); ++it)
{
const PluginDescriptor& pluginDescipror = it->m_plugin->getPluginDescriptor();
channels->addItem(pluginDescipror.displayedName);