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

get rid of DeviceSinkAPI::setOutputGUI

pull/85/head
f4exb 2017-09-15 02:06:59 +02:00
rodzic 9e2f639837
commit 6593f141eb
3 zmienionych plików z 2 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
sdrbase/device/devicesinkapi.cpp
Wyświetl plik

@ -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;

1
sdrbase/device/devicesinkapi.h
Wyświetl plik

@ -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);

4
sdrbase/mainwindow.cpp
Wyświetl plik

@ -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
}