From 2ceacfa107aceb9959e6b97edd0a7c0d0a19366e Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Thu, 1 Oct 2015 05:47:24 +0200
Subject: [PATCH] Normalize BladeRF plugin identifier

---
 plugins/samplesource/bladerf/bladerfplugin.cpp | 8 +++++---
 plugins/samplesource/bladerf/bladerfplugin.h   | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/samplesource/bladerf/bladerfplugin.cpp b/plugins/samplesource/bladerf/bladerfplugin.cpp
index 1ef944127..f514e13be 100644
--- a/plugins/samplesource/bladerf/bladerfplugin.cpp
+++ b/plugins/samplesource/bladerf/bladerfplugin.cpp
@@ -31,6 +31,8 @@ const PluginDescriptor BlderfPlugin::m_pluginDescriptor = {
 	QString("https://github.com/f4exb/sdrangel")
 };
 
+const QString BlderfPlugin::m_deviceTypeID = BLADERF_DEVICE_TYPE_ID;
+
 BlderfPlugin::BlderfPlugin(QObject* parent) :
 	QObject(parent),
 	m_pluginAPI(0)
@@ -45,7 +47,7 @@ const PluginDescriptor& BlderfPlugin::getPluginDescriptor() const
 void BlderfPlugin::initPlugin(PluginAPI* pluginAPI)
 {
 	m_pluginAPI = pluginAPI;
-	m_pluginAPI->registerSampleSource("org.osmocom.sdr.samplesource.bladerf", this);
+	m_pluginAPI->registerSampleSource(m_deviceTypeID, this);
 }
 
 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));
 
 		result.append(SampleSourceDevice(displayedName,
-				"org.osmocom.sdr.samplesource.bladerf",
+				m_deviceTypeID,
 				QString(devinfo[i].serial),
 				i));
 	}
@@ -80,7 +82,7 @@ PluginGUI* BlderfPlugin::createSampleSourcePluginGUI(const QString& sourceId)
 		return 0;
 	}
 
-	if(sourceId == "org.osmocom.sdr.samplesource.bladerf")
+	if(sourceId == m_deviceTypeID)
 	{
 		BladerfGui* gui = new BladerfGui(m_pluginAPI);
 		m_pluginAPI->setInputGUI(gui);
diff --git a/plugins/samplesource/bladerf/bladerfplugin.h b/plugins/samplesource/bladerf/bladerfplugin.h
index 7604aa8b0..47f550437 100644
--- a/plugins/samplesource/bladerf/bladerfplugin.h
+++ b/plugins/samplesource/bladerf/bladerfplugin.h
@@ -20,10 +20,12 @@
 #include <QObject>
 #include "plugin/plugininterface.h"
 
+#define BLADERF_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf"
+
 class BlderfPlugin : public QObject, public PluginInterface {
 	Q_OBJECT
 	Q_INTERFACES(PluginInterface)
-	Q_PLUGIN_METADATA(IID "org.osmocom.sdr.samplesource.bladerf")
+	Q_PLUGIN_METADATA(IID BLADERF_DEVICE_TYPE_ID)
 
 public:
 	explicit BlderfPlugin(QObject* parent = NULL);
@@ -34,6 +36,8 @@ public:
 	virtual SampleSourceDevices enumSampleSources();
 	virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId);
 
+	static const QString m_deviceTypeID;
+
 private:
 	static const PluginDescriptor m_pluginDescriptor;