VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-03 17:35:23 -04:00
Code Issues Projects Releases Wiki Activity

Normalize BladeRF plugin identifier

Browse Source
This commit is contained in:
f4exb 2015-10-01 05:47:24 +02:00
parent 6d3f975124
commit 2ceacfa107
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,8 @@ const PluginDescriptor BlderfPlugin::m_pluginDescriptor = {
QString("https://github.com/f4exb/sdrangel") QString("https://github.com/f4exb/sdrangel")
}; };
const QString BlderfPlugin::m_deviceTypeID = BLADERF_DEVICE_TYPE_ID;
BlderfPlugin::BlderfPlugin(QObject* parent) : BlderfPlugin::BlderfPlugin(QObject* parent) :
QObject(parent), QObject(parent),
m_pluginAPI(0) m_pluginAPI(0)
@ -45,7 +47,7 @@ const PluginDescriptor& BlderfPlugin::getPluginDescriptor() const
void BlderfPlugin::initPlugin(PluginAPI* pluginAPI) void BlderfPlugin::initPlugin(PluginAPI* pluginAPI)
{ {
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
m_pluginAPI->registerSampleSource("org.osmocom.sdr.samplesource.bladerf", this); m_pluginAPI->registerSampleSource(m_deviceTypeID, this);
} }
PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources() PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources()
@ -60,7 +62,7 @@ PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources()
QString displayedName(QString("BladeRF[%1] %2").arg(devinfo[i].instance).arg(devinfo[i].serial)); QString displayedName(QString("BladeRF[%1] %2").arg(devinfo[i].instance).arg(devinfo[i].serial));
result.append(SampleSourceDevice(displayedName, result.append(SampleSourceDevice(displayedName,
"org.osmocom.sdr.samplesource.bladerf", m_deviceTypeID,
QString(devinfo[i].serial), QString(devinfo[i].serial),
i)); i));
} }
@ -80,7 +82,7 @@ PluginGUI* BlderfPlugin::createSampleSourcePluginGUI(const QString& sourceId)
return 0; return 0;
} }
if(sourceId == "org.osmocom.sdr.samplesource.bladerf") if(sourceId == m_deviceTypeID)
{ {
BladerfGui* gui = new BladerfGui(m_pluginAPI); BladerfGui* gui = new BladerfGui(m_pluginAPI);
m_pluginAPI->setInputGUI(gui); m_pluginAPI->setInputGUI(gui);

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

@ -20,10 +20,12 @@
#include <QObject> #include <QObject>
#include "plugin/plugininterface.h" #include "plugin/plugininterface.h"
#define BLADERF_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf"
class BlderfPlugin : public QObject, public PluginInterface { class BlderfPlugin : public QObject, public PluginInterface {
Q_OBJECT Q_OBJECT
Q_INTERFACES(PluginInterface) Q_INTERFACES(PluginInterface)
Q_PLUGIN_METADATA(IID "org.osmocom.sdr.samplesource.bladerf") Q_PLUGIN_METADATA(IID BLADERF_DEVICE_TYPE_ID)
public: public:
explicit BlderfPlugin(QObject* parent = NULL); explicit BlderfPlugin(QObject* parent = NULL);
@ -34,6 +36,8 @@ public:
virtual SampleSourceDevices enumSampleSources(); virtual SampleSourceDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId); virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId);
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;