From aea8de22a123b2b2d1367bde44697e456af43dc4 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 1 Nov 2017 18:45:03 +0100 Subject: [PATCH] Removed useless reference to device source and sink APIs in the sampling device control widget --- sdrgui/gui/samplingdevicecontrol.cpp | 4 +--- sdrgui/gui/samplingdevicecontrol.h | 4 ---- sdrgui/mainwindow.cpp | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/sdrgui/gui/samplingdevicecontrol.cpp b/sdrgui/gui/samplingdevicecontrol.cpp index 8fd29a3b8..7d061e964 100644 --- a/sdrgui/gui/samplingdevicecontrol.cpp +++ b/sdrgui/gui/samplingdevicecontrol.cpp @@ -23,9 +23,7 @@ SamplingDeviceControl::SamplingDeviceControl(QWidget* parent) : QWidget(parent), ui(new Ui::SamplingDeviceControl), - m_pluginManager(0), - m_deviceSourceAPI(0), - m_deviceSinkAPI(0) + m_pluginManager(0) { ui->setupUi(this); } diff --git a/sdrgui/gui/samplingdevicecontrol.h b/sdrgui/gui/samplingdevicecontrol.h index dd5b6b4f9..3773f5e30 100644 --- a/sdrgui/gui/samplingdevicecontrol.h +++ b/sdrgui/gui/samplingdevicecontrol.h @@ -41,8 +41,6 @@ public: ~SamplingDeviceControl(); void setPluginManager(PluginManager *pluginManager) { m_pluginManager = pluginManager; } - void setDeviceAPI(DeviceSourceAPI *deviceAPI) { m_deviceSourceAPI = deviceAPI; } - void setDeviceAPI(DeviceSinkAPI *deviceAPI) { m_deviceSinkAPI = deviceAPI; } QComboBox *getDeviceSelector(); QPushButton *getDeviceSelectionConfirm(); QComboBox *getChannelSelector(); @@ -51,8 +49,6 @@ public: private: Ui::SamplingDeviceControl* ui; PluginManager *m_pluginManager; - DeviceSourceAPI *m_deviceSourceAPI; - DeviceSinkAPI *m_deviceSinkAPI; }; diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index e986ef629..b46624d3f 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -214,7 +214,6 @@ void MainWindow::addSourceDevice() DeviceSourceAPI *deviceSourceAPI = new DeviceSourceAPI(deviceTabIndex, dspDeviceSourceEngine); m_deviceUIs.back()->m_deviceSourceAPI = deviceSourceAPI; - m_deviceUIs.back()->m_samplingDeviceControl->setDeviceAPI(deviceSourceAPI); m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager); QList channelNames; m_pluginManager->listRxChannels(channelNames); @@ -280,7 +279,6 @@ void MainWindow::addSinkDevice() m_deviceUIs.back()->m_deviceSourceAPI = 0; m_deviceUIs.back()->m_deviceSinkAPI = deviceSinkAPI; - m_deviceUIs.back()->m_samplingDeviceControl->setDeviceAPI(deviceSinkAPI); m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager); QList channelNames; m_pluginManager->listTxChannels(channelNames);