mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-05 07:24:44 -04:00
Multi device support: remainder source plugins: removed useless dependencies on plugin API
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
#include <QMessageBox>
|
||||
|
||||
#include "ui_fcdprogui.h"
|
||||
#include "plugin/pluginapi.h"
|
||||
#include "device/deviceapi.h"
|
||||
#include "gui/colormapper.h"
|
||||
#include "gui/glspectrum.h"
|
||||
@@ -27,10 +26,9 @@
|
||||
#include "fcdprogui.h"
|
||||
#include "fcdproconst.h"
|
||||
|
||||
FCDProGui::FCDProGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
|
||||
FCDProGui::FCDProGui(DeviceAPI *deviceAPI, QWidget* parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::FCDProGui),
|
||||
m_pluginAPI(pluginAPI),
|
||||
m_deviceAPI(deviceAPI),
|
||||
m_settings(),
|
||||
m_sampleSource(NULL),
|
||||
|
||||
@@ -22,9 +22,9 @@
|
||||
#include "fcdproinput.h"
|
||||
#include "plugin/plugingui.h"
|
||||
|
||||
class PluginAPI;
|
||||
class DeviceAPI;
|
||||
class FileSink;
|
||||
class QWidget;
|
||||
|
||||
namespace Ui {
|
||||
class FCDProGui;
|
||||
@@ -34,7 +34,7 @@ class FCDProGui : public QWidget, public PluginGUI {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit FCDProGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
|
||||
explicit FCDProGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
|
||||
virtual ~FCDProGui();
|
||||
void destroy();
|
||||
|
||||
@@ -52,7 +52,6 @@ public:
|
||||
private:
|
||||
Ui::FCDProGui* ui;
|
||||
|
||||
PluginAPI* m_pluginAPI;
|
||||
DeviceAPI* m_deviceAPI;
|
||||
FCDProSettings m_settings;
|
||||
QTimer m_updateTimer;
|
||||
|
||||
@@ -46,9 +46,7 @@ const PluginDescriptor& FCDProPlugin::getPluginDescriptor() const
|
||||
|
||||
void FCDProPlugin::initPlugin(PluginAPI* pluginAPI)
|
||||
{
|
||||
m_pluginAPI = pluginAPI;
|
||||
|
||||
m_pluginAPI->registerSampleSource(fcd_traits<Pro>::interfaceIID, this);
|
||||
pluginAPI->registerSampleSource(fcd_traits<Pro>::interfaceIID, this);
|
||||
}
|
||||
|
||||
PluginInterface::SampleSourceDevices FCDProPlugin::enumSampleSources()
|
||||
@@ -79,7 +77,7 @@ PluginGUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QW
|
||||
{
|
||||
if(sourceId == fcd_traits<Pro>::interfaceIID)
|
||||
{
|
||||
FCDProGui* gui = new FCDProGui(m_pluginAPI, deviceAPI);
|
||||
FCDProGui* gui = new FCDProGui(deviceAPI);
|
||||
*widget = gui;
|
||||
return gui;
|
||||
}
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#define FCDPRO_DEVICE_TYPE_ID "sdrangel.samplesource.fcdpro"
|
||||
|
||||
class PluginAPI;
|
||||
|
||||
class FCDProPlugin : public QObject, public PluginInterface {
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(PluginInterface)
|
||||
@@ -24,8 +26,6 @@ public:
|
||||
|
||||
private:
|
||||
static const PluginDescriptor m_pluginDescriptor;
|
||||
|
||||
PluginAPI* m_pluginAPI;
|
||||
};
|
||||
|
||||
#endif // INCLUDE_FCDPLUGIN_H
|
||||
|
||||
Reference in New Issue
Block a user