From 9e2f639837be6f44033b28e28db6f5c78664ee82 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 15 Sep 2017 02:04:16 +0200
Subject: [PATCH] get rid of DeviceSourceAPI::setInputGUI
---
sdrbase/device/devicesourceapi.cpp | 5 -----
sdrbase/device/devicesourceapi.h | 1 -
sdrbase/mainwindow.cpp | 7 ++++---
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/sdrbase/device/devicesourceapi.cpp b/sdrbase/device/devicesourceapi.cpp
index e62834672..f1887d807 100644
--- a/sdrbase/device/devicesourceapi.cpp
+++ b/sdrbase/device/devicesourceapi.cpp
@@ -143,11 +143,6 @@ void DeviceSourceAPI::addRollupWidget(QWidget *widget)
m_channelWindow->addRollupWidget(widget);
}
-void DeviceSourceAPI::setInputGUI(QWidget* inputGUI, const QString& sourceDisplayName)
-{
- m_mainWindow->setDeviceGUI(m_deviceTabIndex, inputGUI, sourceDisplayName);
-}
-
void DeviceSourceAPI::setHardwareId(const QString& id)
{
m_hardwareId = id;
diff --git a/sdrbase/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h
index 15387ad19..6d21578a2 100644
--- a/sdrbase/device/devicesourceapi.h
+++ b/sdrbase/device/devicesourceapi.h
@@ -66,7 +66,6 @@ public:
void addChannelMarker(ChannelMarker* channelMarker); //!< Add channel marker to spectrum
ChannelWindow *getChannelWindow(); //!< Direct channel window getter
void addRollupWidget(QWidget *widget); //!< Add rollup widget to channel window
- void setInputGUI(QWidget* inputGUI, const QString& sourceDisplayName);
void setHardwareId(const QString& id);
void setSampleSourceId(const QString& id);
diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index c9ee5c327..dffacc90d 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -144,7 +144,7 @@ MainWindow::MainWindow(QWidget* parent) :
PluginInstanceUI *pluginGUI = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI(
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), &gui, m_deviceUIs.back()->m_deviceSourceAPI);
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInstanceUI(pluginGUI);
- m_deviceUIs.back()->m_deviceSourceAPI->setInputGUI(gui, m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceDisplayName());
+ setDeviceGUI(0, gui, m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceDisplayName());
m_deviceUIs.back()->m_deviceSourceAPI->setBuddyLeader(true); // the first device is always the leader
@@ -224,7 +224,8 @@ void MainWindow::addSourceDevice()
PluginInstanceUI *pluginGUI = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI(
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), &gui, m_deviceUIs.back()->m_deviceSourceAPI);
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInstanceUI(pluginGUI);
- m_deviceUIs.back()->m_deviceSourceAPI->setInputGUI(gui, m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceDisplayName());
+ setDeviceGUI(deviceTabIndex, gui, m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceDisplayName());
+
}
void MainWindow::addSinkDevice()
@@ -861,7 +862,7 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
PluginInstanceUI *pluginUI = sampleSourceDevice->m_plugin->createSampleSourcePluginInstanceGUI(sampleSourceDevice->m_deviceId, &gui, deviceUI->m_deviceSourceAPI);
deviceUI->m_deviceSourceAPI->setSampleSourcePluginInstanceUI(pluginUI);
- deviceUI->m_deviceSourceAPI->setInputGUI(gui, sampleSourceDevice->m_displayName);
+ setDeviceGUI(currentSourceTabIndex, gui, sampleSourceDevice->m_displayName);
deviceUI->m_deviceSourceAPI->loadSourceSettings(m_settings.getWorkingPreset()); // load new API settings