kopia lustrzana https://github.com/f4exb/sdrangel
Multi device support: removed GLSpectrum dependency in plugin manager
rodzic
2893d7bb06
commit
9013e057fa
|
@ -202,7 +202,7 @@ void MainWindow::addDevice()
|
|||
m_deviceUIs.back()->m_deviceAPI = deviceAPI;
|
||||
|
||||
// TODO: do not create one plugin manager per device. Use device API instead
|
||||
PluginManager *pluginManager = new PluginManager(this, m_deviceUIs.size()-1, dspDeviceEngine, m_deviceUIs.back()->m_spectrum);
|
||||
PluginManager *pluginManager = new PluginManager(this, m_deviceUIs.size()-1, dspDeviceEngine);
|
||||
m_deviceUIs.back()->m_pluginManager = pluginManager;
|
||||
|
||||
pluginManager->loadPlugins();
|
||||
|
|
|
@ -13,13 +13,12 @@
|
|||
|
||||
#include <QDebug>
|
||||
|
||||
PluginManager::PluginManager(MainWindow* mainWindow, uint deviceTabIndex, DSPDeviceEngine* dspDeviceEngine, GLSpectrum *spectrum, QObject* parent) :
|
||||
PluginManager::PluginManager(MainWindow* mainWindow, uint deviceTabIndex, DSPDeviceEngine* dspDeviceEngine, QObject* parent) :
|
||||
QObject(parent),
|
||||
m_pluginAPI(this, mainWindow),
|
||||
m_mainWindow(mainWindow),
|
||||
m_deviceTabIndex(deviceTabIndex),
|
||||
m_dspDeviceEngine(dspDeviceEngine),
|
||||
m_spectrum(spectrum),
|
||||
m_sampleSourceId(),
|
||||
m_sampleSourceSerial(),
|
||||
m_sampleSourceSequence(0),
|
||||
|
|
|
@ -14,7 +14,6 @@ class MainWindow;
|
|||
class Message;
|
||||
class MessageQueue;
|
||||
class DSPDeviceEngine;
|
||||
class GLSpectrum;
|
||||
class DeviceAPI;
|
||||
|
||||
class SDRANGEL_API PluginManager : public QObject {
|
||||
|
@ -36,7 +35,7 @@ public:
|
|||
|
||||
typedef QList<Plugin> Plugins;
|
||||
|
||||
explicit PluginManager(MainWindow* mainWindow, uint deviceTabIndex, DSPDeviceEngine* dspDeviceEngine, GLSpectrum *spectrum, QObject* parent = NULL);
|
||||
explicit PluginManager(MainWindow* mainWindow, uint deviceTabIndex, DSPDeviceEngine* dspDeviceEngine, QObject* parent = NULL);
|
||||
~PluginManager();
|
||||
|
||||
void loadPlugins();
|
||||
|
@ -130,7 +129,6 @@ private:
|
|||
MainWindow* m_mainWindow;
|
||||
uint m_deviceTabIndex;
|
||||
DSPDeviceEngine* m_dspDeviceEngine;
|
||||
GLSpectrum* m_spectrum;
|
||||
Plugins m_plugins;
|
||||
|
||||
ChannelRegistrations m_channelRegistrations;
|
||||
|
|
Ładowanie…
Reference in New Issue