From 1974b375ee21ea869669d6d2d2a19ab28bb111ea Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 17 May 2016 17:53:22 +0200
Subject: [PATCH] Multi device support: RTL-SDR plugin removed useless
 dependencies on plugin API

---
 plugins/samplesource/rtlsdr/rtlsdrgui.cpp    | 4 +---
 plugins/samplesource/rtlsdr/rtlsdrgui.h      | 4 +---
 plugins/samplesource/rtlsdr/rtlsdrplugin.cpp | 6 ++----
 plugins/samplesource/rtlsdr/rtlsdrplugin.h   | 4 ++--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
index df64d0e6d..82fbc5959 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
@@ -19,7 +19,6 @@
 
 #include "rtlsdrgui.h"
 #include "ui_rtlsdrgui.h"
-#include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
 #include "gui/colormapper.h"
 #include "gui/glspectrum.h"
@@ -27,10 +26,9 @@
 #include "dsp/dspcommands.h"
 #include "dsp/filesink.h"
 
-RTLSDRGui::RTLSDRGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
+RTLSDRGui::RTLSDRGui(DeviceAPI *deviceAPI, QWidget* parent) :
 	QWidget(parent),
 	ui(new Ui::RTLSDRGui),
-	m_pluginAPI(pluginAPI),
 	m_deviceAPI(deviceAPI),
 	m_settings(),
 	m_sampleSource(0),
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h
index bca8b1e4c..cc8d56abf 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h
@@ -21,7 +21,6 @@
 #include "plugin/plugingui.h"
 #include "rtlsdrinput.h"
 
-class PluginAPI;
 class DeviceAPI;
 class FileSink;
 
@@ -34,7 +33,7 @@ class RTLSDRGui : public QWidget, public PluginGUI {
 	Q_OBJECT
 
 public:
-	explicit RTLSDRGui(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
+	explicit RTLSDRGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
 	virtual ~RTLSDRGui();
 	void destroy();
 
@@ -51,7 +50,6 @@ public:
 private:
 	Ui::RTLSDRGui* ui;
 
-	PluginAPI* m_pluginAPI;
 	DeviceAPI* m_deviceAPI;
 	RTLSDRSettings m_settings;
 	QTimer m_updateTimer;
diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
index f182c3cdf..f95407f73 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
@@ -30,9 +30,7 @@ const PluginDescriptor& RTLSDRPlugin::getPluginDescriptor() const
 
 void RTLSDRPlugin::initPlugin(PluginAPI* pluginAPI)
 {
-	m_pluginAPI = pluginAPI;
-
-	m_pluginAPI->registerSampleSource(m_deviceTypeID, this);
+	pluginAPI->registerSampleSource(m_deviceTypeID, this);
 }
 
 PluginInterface::SampleSourceDevices RTLSDRPlugin::enumSampleSources()
@@ -63,7 +61,7 @@ PluginInterface::SampleSourceDevices RTLSDRPlugin::enumSampleSources()
 PluginGUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
 {
 	if(sourceId == m_deviceTypeID) {
-		RTLSDRGui* gui = new RTLSDRGui(m_pluginAPI, deviceAPI);
+		RTLSDRGui* gui = new RTLSDRGui(deviceAPI);
 		*widget = gui;
 		return gui;
 	} else {
diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.h b/plugins/samplesource/rtlsdr/rtlsdrplugin.h
index 6e55b2f99..6f061157a 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.h
@@ -4,6 +4,8 @@
 #include <QObject>
 #include "plugin/plugininterface.h"
 
+class PluginAPI;
+
 #define RTLSDR_DEVICE_TYPE_ID "sdrangel.samplesource.rtlsdr"
 
 class RTLSDRPlugin : public QObject, public PluginInterface {
@@ -24,8 +26,6 @@ public:
 
 private:
 	static const PluginDescriptor m_pluginDescriptor;
-
-	PluginAPI* m_pluginAPI;
 };
 
 #endif // INCLUDE_RTLSDRPLUGIN_H