VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

rework spaces on pluginmanager.cpp

Browse Source
This commit is contained in:
Davide Gerhard 2019-05-18 18:58:35 +02:00
parent c5f52812e1
commit 63a63a807a
No known key found for this signature in database
GPG Key ID: 7CBEFA144857DC97
1 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
sdrbase/plugin/pluginmanager.cpp
View File

@ -80,23 +80,23 @@ void PluginManager::loadPluginsPart(const QString& pluginsSubDir)
// NOTE: exit on the first folder found // NOTE: exit on the first folder found
bool found = false; bool found = false;
foreach (QString dir, PluginsPath) foreach (QString dir, PluginsPath)
{ {
QDir d(dir); QDir d(dir);
if (d.entryList(QDir::Files).count() == 0) { if (d.entryList(QDir::Files).count() == 0) {
qDebug("PluginManager::loadPluginsPart folder %s is empty", qPrintable(dir)); qDebug("PluginManager::loadPluginsPart folder %s is empty", qPrintable(dir));
continue; continue;
} }
found = true; found = true;
loadPluginsDir(d); loadPluginsDir(d);
break; break;
} }
if (!found) if (!found)
{ {
qCritical("No plugins found. Exit immediately."); qCritical("No plugins found. Exit immediately.");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
void PluginManager::loadPluginsFinal() void PluginManager::loadPluginsFinal()
@ -150,74 +150,74 @@ void PluginManager::registerSampleSink(const QString& sinkName, PluginInterface*
void PluginManager::loadPluginsDir(const QDir& dir) void PluginManager::loadPluginsDir(const QDir& dir)
{ {
QDir pluginsDir(dir); QDir pluginsDir(dir);
foreach (QString fileName, pluginsDir.entryList(QDir::Files)) foreach (QString fileName, pluginsDir.entryList(QDir::Files))
{ {
if (QLibrary::isLibrary(fileName)) if (QLibrary::isLibrary(fileName))
{ {
qDebug("PluginManager::loadPluginsDir: fileName: %s", qPrintable(fileName)); qDebug("PluginManager::loadPluginsDir: fileName: %s", qPrintable(fileName));
QPluginLoader* plugin = new QPluginLoader(pluginsDir.absoluteFilePath(fileName)); QPluginLoader* pluginLoader = new QPluginLoader(pluginsDir.absoluteFilePath(fileName));
if (!plugin->load()) if (!pluginLoader->load())
{ {
qWarning("PluginManager::loadPluginsDir: %s", qPrintable(plugin->errorString())); qWarning("PluginManager::loadPluginsDir: %s", qPrintable(pluginLoader->errorString()));
delete plugin; delete pluginLoader;
continue; continue;
} }
PluginInterface* instance = qobject_cast<PluginInterface*>(plugin->instance()); PluginInterface* instance = qobject_cast<PluginInterface*>(pluginLoader->instance());
if (instance == nullptr) if (instance == nullptr)
{ {
qWarning("PluginManager::loadPluginsDir: Unable to get main instance of plugin: %s", qPrintable(fileName) ); qWarning("PluginManager::loadPluginsDir: Unable to get main instance of plugin: %s", qPrintable(fileName) );
delete plugin; delete pluginLoader;
continue; continue;
} }
qInfo("PluginManager::loadPluginsDir: loaded plugin %s", qPrintable(fileName)); qInfo("PluginManager::loadPluginsDir: loaded plugin %s", qPrintable(fileName));
m_plugins.append(Plugin(fileName, plugin, instance)); m_plugins.append(Plugin(fileName, pluginLoader, instance));
} }
} }
} }
void PluginManager::listTxChannels(QList<QString>& list) void PluginManager::listTxChannels(QList<QString>& list)
{ {
list.clear(); list.clear();
for(PluginAPI::ChannelRegistrations::iterator it = m_txChannelRegistrations.begin(); it != m_txChannelRegistrations.end(); ++it) for(PluginAPI::ChannelRegistrations::iterator it = m_txChannelRegistrations.begin(); it != m_txChannelRegistrations.end(); ++it)
{ {
const PluginDescriptor& pluginDescipror = it->m_plugin->getPluginDescriptor(); const PluginDescriptor& pluginDescipror = it->m_plugin->getPluginDescriptor();
list.append(pluginDescipror.displayedName); list.append(pluginDescipror.displayedName);
} }
} }
void PluginManager::listRxChannels(QList<QString>& list) void PluginManager::listRxChannels(QList<QString>& list)
{ {
list.clear(); list.clear();
for(PluginAPI::ChannelRegistrations::iterator it = m_rxChannelRegistrations.begin(); it != m_rxChannelRegistrations.end(); ++it) for(PluginAPI::ChannelRegistrations::iterator it = m_rxChannelRegistrations.begin(); it != m_rxChannelRegistrations.end(); ++it)
{ {
const PluginDescriptor& pluginDesciptor = it->m_plugin->getPluginDescriptor(); const PluginDescriptor& pluginDesciptor = it->m_plugin->getPluginDescriptor();
list.append(pluginDesciptor.displayedName); list.append(pluginDesciptor.displayedName);
} }
} }
void PluginManager::createRxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceAPI *deviceAPI) void PluginManager::createRxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceAPI *deviceAPI)
{ {
if (channelPluginIndex < m_rxChannelRegistrations.size()) if (channelPluginIndex < m_rxChannelRegistrations.size())
{ {
PluginInterface *pluginInterface = m_rxChannelRegistrations[channelPluginIndex].m_plugin; PluginInterface *pluginInterface = m_rxChannelRegistrations[channelPluginIndex].m_plugin;
BasebandSampleSink *rxChannel = pluginInterface->createRxChannelBS(deviceAPI); BasebandSampleSink *rxChannel = pluginInterface->createRxChannelBS(deviceAPI);
pluginInterface->createRxChannelGUI(deviceUISet, rxChannel); pluginInterface->createRxChannelGUI(deviceUISet, rxChannel);
} }
} }
void PluginManager::createTxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceAPI *deviceAPI) void PluginManager::createTxChannelInstance(int channelPluginIndex, DeviceUISet *deviceUISet, DeviceAPI *deviceAPI)
{ {
if (channelPluginIndex < m_txChannelRegistrations.size()) if (channelPluginIndex < m_txChannelRegistrations.size())
{ {
PluginInterface *pluginInterface = m_txChannelRegistrations[channelPluginIndex].m_plugin; PluginInterface *pluginInterface = m_txChannelRegistrations[channelPluginIndex].m_plugin;
BasebandSampleSource *txChannel = pluginInterface->createTxChannelBS(deviceAPI); BasebandSampleSource *txChannel = pluginInterface->createTxChannelBS(deviceAPI);
pluginInterface->createTxChannelGUI(deviceUISet, txChannel); pluginInterface->createTxChannelGUI(deviceUISet, txChannel);
} }
} }