mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Removed useless reference to device source and sink APIs in the sampling device control widget

pull/127/head
f4exb 2017-11-01 18:45:03 +01:00
rodzic 7370eba0f7
commit aea8de22a1
3 zmienionych plików z 1 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
sdrgui/gui/samplingdevicecontrol.cpp
Wyświetl plik

@ -23,9 +23,7 @@
SamplingDeviceControl::SamplingDeviceControl(QWidget* parent) : SamplingDeviceControl::SamplingDeviceControl(QWidget* parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::SamplingDeviceControl), ui(new Ui::SamplingDeviceControl),
m_pluginManager(0), m_pluginManager(0)
m_deviceSourceAPI(0),
m_deviceSinkAPI(0)
{ {
ui->setupUi(this); ui->setupUi(this);
} }

4
sdrgui/gui/samplingdevicecontrol.h
Wyświetl plik

@ -41,8 +41,6 @@ public:
~SamplingDeviceControl(); ~SamplingDeviceControl();
void setPluginManager(PluginManager *pluginManager) { m_pluginManager = pluginManager; } void setPluginManager(PluginManager *pluginManager) { m_pluginManager = pluginManager; }
void setDeviceAPI(DeviceSourceAPI *deviceAPI) { m_deviceSourceAPI = deviceAPI; }
void setDeviceAPI(DeviceSinkAPI *deviceAPI) { m_deviceSinkAPI = deviceAPI; }
QComboBox *getDeviceSelector(); QComboBox *getDeviceSelector();
QPushButton *getDeviceSelectionConfirm(); QPushButton *getDeviceSelectionConfirm();
QComboBox *getChannelSelector(); QComboBox *getChannelSelector();
@ -51,8 +49,6 @@ public:
private: private:
Ui::SamplingDeviceControl* ui; Ui::SamplingDeviceControl* ui;
PluginManager *m_pluginManager; PluginManager *m_pluginManager;
DeviceSourceAPI *m_deviceSourceAPI;
DeviceSinkAPI *m_deviceSinkAPI;
}; };

2
sdrgui/mainwindow.cpp
Wyświetl plik

@ -214,7 +214,6 @@ void MainWindow::addSourceDevice()
DeviceSourceAPI *deviceSourceAPI = new DeviceSourceAPI(deviceTabIndex, dspDeviceSourceEngine); DeviceSourceAPI *deviceSourceAPI = new DeviceSourceAPI(deviceTabIndex, dspDeviceSourceEngine);
m_deviceUIs.back()->m_deviceSourceAPI = deviceSourceAPI; m_deviceUIs.back()->m_deviceSourceAPI = deviceSourceAPI;
m_deviceUIs.back()->m_samplingDeviceControl->setDeviceAPI(deviceSourceAPI);
m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager); m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager);
QList<QString> channelNames; QList<QString> channelNames;
m_pluginManager->listRxChannels(channelNames); m_pluginManager->listRxChannels(channelNames);
@ -280,7 +279,6 @@ void MainWindow::addSinkDevice()
m_deviceUIs.back()->m_deviceSourceAPI = 0; m_deviceUIs.back()->m_deviceSourceAPI = 0;
m_deviceUIs.back()->m_deviceSinkAPI = deviceSinkAPI; m_deviceUIs.back()->m_deviceSinkAPI = deviceSinkAPI;
m_deviceUIs.back()->m_samplingDeviceControl->setDeviceAPI(deviceSinkAPI);
m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager); m_deviceUIs.back()->m_samplingDeviceControl->setPluginManager(m_pluginManager);
QList<QString> channelNames; QList<QString> channelNames;
m_pluginManager->listTxChannels(channelNames); m_pluginManager->listTxChannels(channelNames);