major rewrite and changes... far too many to put into individual commits

4 files changed, 16 insertions, 16 deletions

diff --git a/plugins/samplesource/osmosdr/osmosdrgui.cpp b/plugins/samplesource/osmosdr/osmosdrgui.cpp
index ddaf4d3..3ecaa35 100644
--- a/plugins/samplesource/osmosdr/osmosdrgui.cpp
+++ b/plugins/samplesource/osmosdr/osmosdrgui.cpp
@@ -3,7 +3,7 @@
 #include "plugin/pluginapi.h"
 
 OsmoSDRGui::OsmoSDRGui(PluginAPI* pluginAPI, QWidget* parent) :
-	PluginGUI(parent),
+	QWidget(parent),
 	ui(new Ui::OsmoSDRGui),
 	m_pluginAPI(pluginAPI),
 	m_settings(),
@@ -28,6 +28,11 @@ void OsmoSDRGui::destroy()
 	delete this;
 }
 
+void OsmoSDRGui::setName(const QString& name)
+{
+	setObjectName(name);
+}
+
 void OsmoSDRGui::resetToDefaults()
 {
 	m_generalSettings.resetToDefaults();
diff --git a/plugins/samplesource/osmosdr/osmosdrgui.h b/plugins/samplesource/osmosdr/osmosdrgui.h
index 770b48e..f043653 100644
--- a/plugins/samplesource/osmosdr/osmosdrgui.h
+++ b/plugins/samplesource/osmosdr/osmosdrgui.h
@@ -11,7 +11,7 @@ namespace Ui {
 	class OsmoSDRGui;
 }
 
-class OsmoSDRGui : public PluginGUI {
+class OsmoSDRGui : public QWidget, public PluginGUI {
 	Q_OBJECT
 
 public:
@@ -19,6 +19,8 @@ public:
 	~OsmoSDRGui();
 	void destroy();
 
+	void setName(const QString& name);
+
 	void resetToDefaults();
 	QByteArray serializeGeneral() const;
 	bool deserializeGeneral(const QByteArray&data);
@@ -28,14 +30,6 @@ public:
 	bool handleMessage(Message* message);
 
 private:
-	/*
-	Ui::OsmoSDRGui* ui;
-
-	MessageQueue* m_msgQueue;
-	OsmoSDRInput::Settings m_settings;
-	QTimer m_updateTimer;
-	*/
-
 	Ui::OsmoSDRGui* ui;
 
 	PluginAPI* m_pluginAPI;
diff --git a/plugins/samplesource/osmosdr/osmosdrgui.ui b/plugins/samplesource/osmosdr/osmosdrgui.ui
index 1ad4a88..e618941 100644
--- a/plugins/samplesource/osmosdr/osmosdrgui.ui
+++ b/plugins/samplesource/osmosdr/osmosdrgui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>253</width>
-    <height>224</height>
+    <height>229</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -118,10 +118,7 @@
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="tickPosition">
-        <enum>QSlider::TicksAbove</enum>
-       </property>
-       <property name="tickInterval">
-        <number>1</number>
+        <enum>QSlider::TicksBelow</enum>
        </property>
       </widget>
      </item>
diff --git a/plugins/samplesource/osmosdr/osmosdrplugin.cpp b/plugins/samplesource/osmosdr/osmosdrplugin.cpp
index a61e4c8..183642d 100644
--- a/plugins/samplesource/osmosdr/osmosdrplugin.cpp
+++ b/plugins/samplesource/osmosdr/osmosdrplugin.cpp
@@ -48,17 +48,21 @@ PluginInterface::SampleSourceDevices OsmoSDRPlugin::enumSampleSources()
 		if(osmosdr_get_device_usb_strings(i, vendor, product, serial) != 0)
 			continue;
 		QString displayedName(QString("OsmoSDR #%1 (#%2)").arg(i + 1).arg(serial));
+		qDebug("found %s", qPrintable(displayedName));
 		SimpleSerializer s(1);
 		s.writeS32(1, i);
 		result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.osmo-sdr", s.final()));
 	}
+
 	return result;
 }
 
 PluginGUI* OsmoSDRPlugin::createSampleSource(const QString& sourceName, const QByteArray& address)
 {
 	if(sourceName == "org.osmocom.sdr.samplesource.osmo-sdr") {
-		return new OsmoSDRGui(m_pluginAPI);
+		OsmoSDRGui* gui = new OsmoSDRGui(m_pluginAPI);
+		m_pluginAPI->setInputGUI(gui);
+		return gui;
 	} else {
 		return NULL;
 	}