gnuradioinput: update to latest plugin api changes

4 files changed, 12 insertions, 5 deletions

diff --git a/plugins/samplesource/gnuradio/CMakeLists.txt b/plugins/samplesource/gnuradio/CMakeLists.txt
index fc884b0..0e959ea 100644
--- a/plugins/samplesource/gnuradio/CMakeLists.txt
+++ b/plugins/samplesource/gnuradio/CMakeLists.txt
@@ -41,13 +41,11 @@ include_directories(
 	${GNURADIO_OSMOSDR_INCLUDE_DIRS}
 )
 
-include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 add_definitions(-DQT_PLUGIN)
 add_definitions(-DQT_SHARED)
 add_definitions(-DBOOST_ALL_NO_LIB)
 
-#qt5_wrap_cpp(gnuradio_HEADERS_MOC ${gnuradio_HEADERS})
 qt5_wrap_ui(gnuradio_FORMS_HEADERS ${gnuradio_FORMS})
 
 add_library(inputgnuradio SHARED
diff --git a/plugins/samplesource/gnuradio/gnuradiogui.cpp b/plugins/samplesource/gnuradio/gnuradiogui.cpp
index 8c74aae..037e29d 100644
--- a/plugins/samplesource/gnuradio/gnuradiogui.cpp
+++ b/plugins/samplesource/gnuradio/gnuradiogui.cpp
@@ -28,7 +28,7 @@
 #include <QSlider>
 
 GNURadioGui::GNURadioGui(PluginAPI* pluginAPI, QWidget* parent) :
-	PluginGUI(parent),
+	QWidget(parent),
 	ui(new Ui::GNURadioGui),
 	m_pluginAPI(pluginAPI),
 	m_settings(),
@@ -52,6 +52,11 @@ void GNURadioGui::destroy()
 	delete this;
 }
 
+void GNURadioGui::setName(const QString& name)
+{
+	setObjectName(name);
+}
+
 void GNURadioGui::resetToDefaults()
 {
 	m_generalSettings.resetToDefaults();
diff --git a/plugins/samplesource/gnuradio/gnuradiogui.h b/plugins/samplesource/gnuradio/gnuradiogui.h
index a70c540..900ceba 100644
--- a/plugins/samplesource/gnuradio/gnuradiogui.h
+++ b/plugins/samplesource/gnuradio/gnuradiogui.h
@@ -34,7 +34,7 @@ class GNURadioGui;
 
 class PluginAPI;
 
-class GNURadioGui : public PluginGUI {
+class GNURadioGui : public QWidget, public PluginGUI {
 	Q_OBJECT
 
 public:
@@ -42,6 +42,8 @@ public:
 	~GNURadioGui();
 	void destroy();
 
+	void setName(const QString& name);
+
 	void resetToDefaults();
 	QByteArray serializeGeneral() const;
 	bool deserializeGeneral(const QByteArray&data);
diff --git a/plugins/samplesource/gnuradio/gnuradioplugin.cpp b/plugins/samplesource/gnuradio/gnuradioplugin.cpp
index edd9942..ad18c9d 100644
--- a/plugins/samplesource/gnuradio/gnuradioplugin.cpp
+++ b/plugins/samplesource/gnuradio/gnuradioplugin.cpp
@@ -43,7 +43,9 @@ PluginInterface::SampleSourceDevices GNURadioPlugin::enumSampleSources()
 PluginGUI* GNURadioPlugin::createSampleSource(const QString& sourceName, const QByteArray& address)
 {
 	if(sourceName == "org.osmocom.sdr.samplesource.gr-osmosdr") {
-		return new GNURadioGui(m_pluginAPI);
+		GNURadioGui* gui = new GNURadioGui(m_pluginAPI);
+		m_pluginAPI->setInputGUI(gui);
+		return gui;
 	} else {
 		return NULL;
 	}