From 6593f141eb3e6ba4666aabe20540a59a81ba5db1 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 15 Sep 2017 02:06:59 +0200 Subject: [PATCH] get rid of DeviceSinkAPI::setOutputGUI --- sdrbase/device/devicesinkapi.cpp | 5 ----- sdrbase/device/devicesinkapi.h | 1 - sdrbase/mainwindow.cpp | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sdrbase/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp index 3c2697b73..61b14cba1 100644 --- a/sdrbase/device/devicesinkapi.cpp +++ b/sdrbase/device/devicesinkapi.cpp @@ -147,11 +147,6 @@ void DeviceSinkAPI::addRollupWidget(QWidget *widget) m_channelWindow->addRollupWidget(widget); } -void DeviceSinkAPI::setOutputGUI(QWidget* outputGUI, const QString& sinkDisplayName) -{ - m_mainWindow->setDeviceGUI(m_deviceTabIndex, outputGUI, sinkDisplayName, false); -} - void DeviceSinkAPI::setHardwareId(const QString& id) { m_hardwareId = id; diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h index 98b2b0677..02dc9e1fb 100644 --- a/sdrbase/device/devicesinkapi.h +++ b/sdrbase/device/devicesinkapi.h @@ -64,7 +64,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 setOutputGUI(QWidget* outputGUI, const QString& sinkDisplayName); void setHardwareId(const QString& id); void setSampleSinkId(const QString& id); diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index dffacc90d..e75b221aa 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -276,7 +276,7 @@ void MainWindow::addSinkDevice() PluginInstanceUI *pluginGUI = m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkPluginInterface()->createSampleSinkPluginInstanceGUI( m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkId(), &gui, m_deviceUIs.back()->m_deviceSinkAPI); m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginGUI); - m_deviceUIs.back()->m_deviceSinkAPI->setOutputGUI(gui, m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkDisplayName()); + setDeviceGUI(deviceTabIndex, gui, m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkDisplayName(), false); } void MainWindow::removeLastDevice() @@ -932,7 +932,7 @@ void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused PluginInstanceUI *pluginUI = sampleSinkDevice->m_plugin->createSampleSinkPluginInstanceGUI(sampleSinkDevice->m_deviceId, &gui, deviceUI->m_deviceSinkAPI); deviceUI->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginUI); - deviceUI->m_deviceSinkAPI->setOutputGUI(gui, sampleSinkDevice->m_displayName); + setDeviceGUI(currentSinkTabIndex, gui, sampleSinkDevice->m_displayName, false); deviceUI->m_deviceSinkAPI->loadSinkSettings(m_settings.getWorkingPreset()); // load new API settings }