1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-17 21:28:43 -04:00

DeviceSet: simplify channel registrations (calls) and DeviceUISet: simplify channel registrations

This commit is contained in:
f4exb
2020-10-15 08:52:30 +02:00
parent 7c506f361e
commit 33bc76aa6c
5 changed files with 33 additions and 37 deletions
+4 -4
View File
@@ -1925,7 +1925,7 @@ void MainWindow::channelAddClicked(int channelIndex)
BasebandSampleSink *rxChannel;
pluginInterface->createRxChannel(deviceUI->m_deviceAPI, &rxChannel, &channelAPI);
ChannelGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel);
deviceUI->registerRxChannelInstance(channelAPI->getURI(), channelAPI, gui);
deviceUI->registerRxChannelInstance(channelAPI, gui);
}
else if (deviceUI->m_deviceSinkEngine) // sink device => Tx channels
{
@@ -1935,7 +1935,7 @@ void MainWindow::channelAddClicked(int channelIndex)
BasebandSampleSource *txChannel;
pluginInterface->createTxChannel(deviceUI->m_deviceAPI, &txChannel, &channelAPI);
ChannelGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel);
deviceUI->registerTxChannelInstance(channelAPI->getURI(), channelAPI, gui);
deviceUI->registerTxChannelInstance(channelAPI, gui);
}
else if (deviceUI->m_deviceMIMOEngine) // MIMO device => all possible channels. Depends on index range
{
@@ -1952,7 +1952,7 @@ void MainWindow::channelAddClicked(int channelIndex)
BasebandSampleSink *rxChannel;
pluginInterface->createRxChannel(deviceUI->m_deviceAPI, &rxChannel, &channelAPI);
ChannelGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel);
deviceUI->registerRxChannelInstance(channelAPI->getURI(), channelAPI, gui);
deviceUI->registerRxChannelInstance(channelAPI, gui);
}
else if (channelIndex < nbRxChannels + nbTxChannels)
{
@@ -1962,7 +1962,7 @@ void MainWindow::channelAddClicked(int channelIndex)
BasebandSampleSource *txChannel;
pluginInterface->createTxChannel(deviceUI->m_deviceAPI, &txChannel, &channelAPI);
ChannelGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel);
deviceUI->registerTxChannelInstance(channelAPI->getURI(), channelAPI, gui);
deviceUI->registerTxChannelInstance(channelAPI, gui);
}
}
}