diff options
| author | f4exb <f4exb06@gmail.com> | 2017-11-09 01:03:05 +0100 |
|---|---|---|
| committer | f4exb <f4exb06@gmail.com> | 2017-11-09 01:03:05 +0100 |
| commit | c4e26bf66dfa438c087f09868b7ce49276ef8d13 (patch) | |
| tree | aca107ac89875b1a0f666982ef807595db43d3cb /sdrgui | |
| parent | f2b53fe3aa2376512dbdbab676a2bbc5041a36c4 (diff) | |
Rx channel plugins: use the demodulator constructor separated from the demodulator GUI constructor
Diffstat (limited to 'sdrgui')
| -rw-r--r-- | sdrgui/device/deviceuiset.cpp | 10 | ||||
| -rw-r--r-- | sdrgui/mainwindow.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index 84c750ab8..5540695bc 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -176,11 +176,12 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA if((*channelRegistrations)[i].m_channelId == channelConfig.m_channel) { qDebug("DeviceUISet::loadChannelSettings: creating new channel [%s]", qPrintable(channelConfig.m_channel)); + BasebandSampleSink *rxChannel = (*channelRegistrations)[i].m_plugin->createRxChannel( + channelConfig.m_channel, m_deviceSourceAPI); + PluginInstanceGUI *rxChannelGUI = (*channelRegistrations)[i].m_plugin->createRxChannelGUI( + channelConfig.m_channel, this, rxChannel); reg = ChannelInstanceRegistration( - channelConfig.m_channel, - (*channelRegistrations)[i]. - m_plugin->createRxChannelGUI(channelConfig.m_channel, this) - ); + channelConfig.m_channel, rxChannelGUI); break; } } @@ -274,7 +275,6 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA if((*channelRegistrations)[i].m_channelId == channelConfig.m_channel) { qDebug("DeviceUISet::loadChannelSettings: creating new channel [%s]", qPrintable(channelConfig.m_channel)); - // TODO: create modulator core BasebandSampleSource *txChannel = (*channelRegistrations)[i].m_plugin->createTxChannel( channelConfig.m_channel, m_deviceSinkAPI); PluginInstanceGUI *txChannelGUI = (*channelRegistrations)[i].m_plugin->createTxChannelGUI( diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 2d9a2cd75..9127dfcf3 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -1060,7 +1060,7 @@ void MainWindow::on_channel_addClicked(bool checked __attribute__((unused))) if (deviceUI->m_deviceSourceEngine) // source device => Rx channels { - m_pluginManager->createRxChannelInstance(deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI); + m_pluginManager->createRxChannelInstance(deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI, deviceUI->m_deviceSourceAPI); } else if (deviceUI->m_deviceSinkEngine) // sink device => Tx channels { |