VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-19 15:07:52 -04:00
Code Issues Projects Releases Wiki Activity

Multi device support: BladeRF plugin removed useless dependencies on plugin API

Browse Source
This commit is contained in:
f4exb 2016-05-17 17:57:48 +02:00
parent 1974b375ee
commit 35df869115
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplesource/bladerf/bladerfgui.cpp
View File

@ -20,7 +20,6 @@
#include <libbladeRF.h> #include <libbladeRF.h>
#include "ui_bladerfgui.h" #include "ui_bladerfgui.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h" #include "device/deviceapi.h"
#include "gui/colormapper.h" #include "gui/colormapper.h"
#include "gui/glspectrum.h" #include "gui/glspectrum.h"
@ -29,10 +28,9 @@
#include "dsp/filesink.h" #include "dsp/filesink.h"
#include "bladerfgui.h" #include "bladerfgui.h"
BladerfGui::BladerfGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) : BladerfGui::BladerfGui(DeviceAPI *deviceAPI, QWidget* parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::BladerfGui), ui(new Ui::BladerfGui),
m_pluginAPI(pluginAPI),
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_settings(), m_settings(),
m_sampleSource(NULL), m_sampleSource(NULL),

4
plugins/samplesource/bladerf/bladerfgui.h
View File

@ -22,7 +22,6 @@
#include "bladerfinput.h" #include "bladerfinput.h"
class PluginAPI;
class DeviceAPI; class DeviceAPI;
class FileSink; class FileSink;
@ -35,7 +34,7 @@ class BladerfGui : public QWidget, public PluginGUI {
Q_OBJECT Q_OBJECT
public: public:
explicit BladerfGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL); explicit BladerfGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~BladerfGui(); virtual ~BladerfGui();
void destroy(); void destroy();
@ -52,7 +51,6 @@ public:
private: private:
Ui::BladerfGui* ui; Ui::BladerfGui* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;
BladeRFSettings m_settings; BladeRFSettings m_settings;
QTimer m_updateTimer; QTimer m_updateTimer;

13
plugins/samplesource/bladerf/bladerfplugin.cpp
View File

@ -35,8 +35,7 @@ const PluginDescriptor BlderfPlugin::m_pluginDescriptor = {
const QString BlderfPlugin::m_deviceTypeID = BLADERF_DEVICE_TYPE_ID; const QString BlderfPlugin::m_deviceTypeID = BLADERF_DEVICE_TYPE_ID;
BlderfPlugin::BlderfPlugin(QObject* parent) : BlderfPlugin::BlderfPlugin(QObject* parent) :
QObject(parent), QObject(parent)
m_pluginAPI(0)
{ {
} }
@ -47,8 +46,7 @@ const PluginDescriptor& BlderfPlugin::getPluginDescriptor() const
void BlderfPlugin::initPlugin(PluginAPI* pluginAPI) void BlderfPlugin::initPlugin(PluginAPI* pluginAPI)
{ {
m_pluginAPI = pluginAPI; pluginAPI->registerSampleSource(m_deviceTypeID, this);
m_pluginAPI->registerSampleSource(m_deviceTypeID, this);
} }
PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources() PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources()
@ -78,14 +76,9 @@ PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources()
PluginGUI* BlderfPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceAPI *deviceAPI) PluginGUI* BlderfPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceAPI *deviceAPI)
{ {
if (!m_pluginAPI)
{
return 0;
}
if(sourceId == m_deviceTypeID) if(sourceId == m_deviceTypeID)
{ {
BladerfGui* gui = new BladerfGui(m_pluginAPI, deviceAPI); BladerfGui* gui = new BladerfGui(deviceAPI);
*widget = gui; *widget = gui;
return gui; return gui;
} }

4
plugins/samplesource/bladerf/bladerfplugin.h
View File

@ -20,6 +20,8 @@
#include <QObject> #include <QObject>
#include "plugin/plugininterface.h" #include "plugin/plugininterface.h"
class PluginAPI;
#define BLADERF_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf" #define BLADERF_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf"
class BlderfPlugin : public QObject, public PluginInterface { class BlderfPlugin : public QObject, public PluginInterface {
@ -40,8 +42,6 @@ public:
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
PluginAPI* m_pluginAPI;
}; };
#endif // INCLUDE_BLADERFPLUGIN_H #endif // INCLUDE_BLADERFPLUGIN_H