kopia lustrzana https://github.com/f4exb/sdrangel
Removed main window references from plugin manager
rodzic
ab9474a65f
commit
14b7406ea9
|
@ -457,13 +457,13 @@ void MainWindow::loadPresetSettings(const Preset* preset, int tabIndex)
|
||||||
{
|
{
|
||||||
deviceUI->m_spectrumGUI->deserialize(preset->getSpectrumConfig());
|
deviceUI->m_spectrumGUI->deserialize(preset->getSpectrumConfig());
|
||||||
deviceUI->m_deviceSourceAPI->loadSourceSettings(preset);
|
deviceUI->m_deviceSourceAPI->loadSourceSettings(preset);
|
||||||
deviceUI->m_deviceSourceAPI->loadChannelSettings(preset, &(m_pluginManager->m_pluginAPI));
|
deviceUI->m_deviceSourceAPI->loadChannelSettings(preset, m_pluginManager->getPluginAPI());
|
||||||
}
|
}
|
||||||
else if (deviceUI->m_deviceSinkEngine) // sink device
|
else if (deviceUI->m_deviceSinkEngine) // sink device
|
||||||
{
|
{
|
||||||
deviceUI->m_spectrumGUI->deserialize(preset->getSpectrumConfig());
|
deviceUI->m_spectrumGUI->deserialize(preset->getSpectrumConfig());
|
||||||
deviceUI->m_deviceSinkAPI->loadSinkSettings(preset);
|
deviceUI->m_deviceSinkAPI->loadSinkSettings(preset);
|
||||||
deviceUI->m_deviceSinkAPI->loadChannelSettings(preset, &(m_pluginManager->m_pluginAPI));
|
deviceUI->m_deviceSinkAPI->loadChannelSettings(preset, m_pluginManager->getPluginAPI());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,31 +14,31 @@
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include <plugin/plugininstancegui.h>
|
|
||||||
#include "device/devicesourceapi.h"
|
|
||||||
#include "device/devicesinkapi.h"
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QPluginLoader>
|
#include <QPluginLoader>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
#include "plugin/pluginmanager.h"
|
#include <plugin/plugininstancegui.h>
|
||||||
|
#include "device/devicesourceapi.h"
|
||||||
|
#include "device/devicesinkapi.h"
|
||||||
#include "settings/preset.h"
|
#include "settings/preset.h"
|
||||||
#include "mainwindow.h"
|
|
||||||
#include "gui/glspectrum.h"
|
#include "gui/glspectrum.h"
|
||||||
#include "util/message.h"
|
#include "util/message.h"
|
||||||
|
|
||||||
#include <QDebug>
|
|
||||||
#include "dsp/dspdevicesourceengine.h"
|
#include "dsp/dspdevicesourceengine.h"
|
||||||
#include "dsp/dspdevicesinkengine.h"
|
#include "dsp/dspdevicesinkengine.h"
|
||||||
|
|
||||||
|
#include "plugin/pluginmanager.h"
|
||||||
|
|
||||||
const QString PluginManager::m_sdrDaemonHardwareID = "SDRdaemonSource";
|
const QString PluginManager::m_sdrDaemonHardwareID = "SDRdaemonSource";
|
||||||
const QString PluginManager::m_sdrDaemonDeviceTypeID = "sdrangel.samplesource.sdrdaemonsource";
|
const QString PluginManager::m_sdrDaemonDeviceTypeID = "sdrangel.samplesource.sdrdaemonsource";
|
||||||
const QString PluginManager::m_fileSourceHardwareID = "FileSource";
|
const QString PluginManager::m_fileSourceHardwareID = "FileSource";
|
||||||
const QString PluginManager::m_fileSourceDeviceTypeID = "sdrangel.samplesource.filesource";
|
const QString PluginManager::m_fileSourceDeviceTypeID = "sdrangel.samplesource.filesource";
|
||||||
const QString PluginManager::m_fileSinkDeviceTypeID = "sdrangel.samplesink.filesink";
|
const QString PluginManager::m_fileSinkDeviceTypeID = "sdrangel.samplesink.filesink";
|
||||||
|
|
||||||
PluginManager::PluginManager(MainWindow* mainWindow, QObject* parent) :
|
PluginManager::PluginManager(QObject* parent) :
|
||||||
QObject(parent),
|
QObject(parent),
|
||||||
m_pluginAPI(this)
|
m_pluginAPI(this)
|
||||||
{
|
{
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
class QComboBox;
|
class QComboBox;
|
||||||
class QPluginLoader;
|
class QPluginLoader;
|
||||||
class Preset;
|
class Preset;
|
||||||
class MainWindow;
|
|
||||||
class Message;
|
class Message;
|
||||||
class MessageQueue;
|
class MessageQueue;
|
||||||
class DeviceSourceAPI;
|
class DeviceSourceAPI;
|
||||||
|
@ -36,9 +35,10 @@ public:
|
||||||
|
|
||||||
typedef QList<Plugin> Plugins;
|
typedef QList<Plugin> Plugins;
|
||||||
|
|
||||||
explicit PluginManager(MainWindow* mainWindow, QObject* parent = NULL);
|
explicit PluginManager(QObject* parent = 0);
|
||||||
~PluginManager();
|
~PluginManager();
|
||||||
|
|
||||||
|
PluginAPI *getPluginAPI() { return &m_pluginAPI; }
|
||||||
void loadPlugins();
|
void loadPlugins();
|
||||||
const Plugins& getPlugins() const { return m_plugins; }
|
const Plugins& getPlugins() const { return m_plugins; }
|
||||||
|
|
||||||
|
@ -134,8 +134,6 @@ private:
|
||||||
static const QString m_fileSinkDeviceTypeID; //!< FileSink sink plugin ID
|
static const QString m_fileSinkDeviceTypeID; //!< FileSink sink plugin ID
|
||||||
|
|
||||||
void loadPlugins(const QDir& dir);
|
void loadPlugins(const QDir& dir);
|
||||||
|
|
||||||
friend class MainWindow;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline bool operator<(const PluginManager::Plugin& a, const PluginManager::Plugin& b)
|
static inline bool operator<(const PluginManager::Plugin& a, const PluginManager::Plugin& b)
|
||||||
|
|
Ładowanie…
Reference in New Issue