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

Server: pass plugins subdirectory to the PluginManager::loadPlugins method

Browse Source
This commit is contained in:
f4exb
2017-12-17 10:36:22 +01:00
parent eceb3ac68d
commit f2cdacb057
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/plugin/pluginmanager.cpp
+7 -7
View File
@@ -53,18 +53,18 @@ PluginManager::~PluginManager()
// freeAll();
}
void PluginManager::loadPlugins()
void PluginManager::loadPlugins(const QString& pluginsSubDir)
{
QString applicationDirPath = QCoreApplication::instance()->applicationDirPath();
QString applicationLibPath = applicationDirPath + "/../lib/plugins";
QString applicationBuildPath = applicationDirPath + "/plugins";
QString applicationLibPath = applicationDirPath + "/../lib/" + pluginsSubDir;
QString applicationBuildPath = applicationDirPath + "/" + pluginsSubDir;
qDebug() << "PluginManager::loadPlugins: " << qPrintable(applicationLibPath) << "," << qPrintable(applicationBuildPath);
QDir pluginsLibDir = QDir(applicationLibPath);
QDir pluginsBuildDir = QDir(applicationBuildPath);
loadPlugins(pluginsLibDir);
loadPlugins(pluginsBuildDir);
loadPluginsDir(pluginsLibDir);
loadPluginsDir(pluginsBuildDir);
qSort(m_plugins);
@@ -113,7 +113,7 @@ void PluginManager::registerSampleSink(const QString& sinkName, PluginInterface*
m_sampleSinkRegistrations.append(PluginAPI::SamplingDeviceRegistration(sinkName, plugin));
}
void PluginManager::loadPlugins(const QDir& dir)
void PluginManager::loadPluginsDir(const QDir& dir)
{
QDir pluginsDir(dir);
@@ -152,7 +152,7 @@ void PluginManager::loadPlugins(const QDir& dir)
foreach (QString dirName, pluginsDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
{
loadPlugins(pluginsDir.absoluteFilePath(dirName));
loadPluginsDir(pluginsDir.absoluteFilePath(dirName));
}
}