From 9013e057fa3f30e825a286bc97cd42fb3970974e Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 16 May 2016 10:40:18 +0200 Subject: [PATCH] Multi device support: removed GLSpectrum dependency in plugin manager --- sdrbase/mainwindow.cpp | 2 +- sdrbase/plugin/pluginmanager.cpp | 3 +-- sdrbase/plugin/pluginmanager.h | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index 98cae62c0..9f0219f06 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -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(); diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index c09443a7e..18bd252c7 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -13,13 +13,12 @@ #include -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), diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index 7542896f1..223b3c3a1 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -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 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;