VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-31 05:02:24 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdrbase/device/deviceset.cpp
View File

@ -430,9 +430,8 @@ bool DeviceSet::compareChannels(const ChannelAPI *channelA, const ChannelAPI *ch
} }
} }
void DeviceSet::addChannelInstance(const QString& channelURI, ChannelAPI *channelAPI) void DeviceSet::addChannelInstance(ChannelAPI *channelAPI)
{ {
(void) channelURI;
m_channelInstanceRegistrations.append(channelAPI); m_channelInstanceRegistrations.append(channelAPI);
} }

2
sdrbase/device/deviceset.h
View File

@ -56,7 +56,7 @@ public:
void addTxChannel(int selectedChannelIndex, PluginAPI *pluginAPI); void addTxChannel(int selectedChannelIndex, PluginAPI *pluginAPI);
void addMIMOChannel(int selectedChannelIndex, PluginAPI *pluginAPI); void addMIMOChannel(int selectedChannelIndex, PluginAPI *pluginAPI);
// slave mode // slave mode
void addChannelInstance(const QString& channelURI, ChannelAPI *channelAPI); void addChannelInstance(ChannelAPI *channelAPI);
void removeChannelInstanceAt(int index); void removeChannelInstanceAt(int index);
void removeChannelInstance(ChannelAPI *channelAPI); void removeChannelInstance(ChannelAPI *channelAPI);
void clearChannels(); void clearChannels();

46
sdrgui/device/deviceuiset.cpp
View File

@ -96,10 +96,10 @@ void DeviceUISet::addRollupWidget(QWidget *widget)
m_channelWindow->addRollupWidget(widget); m_channelWindow->addRollupWidget(widget);
} }
void DeviceUISet::registerRxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI) void DeviceUISet::registerRxChannelInstance(ChannelAPI *channelAPI, ChannelGUI* channelGUI)
{ {
m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, channelGUI, 0)); m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelAPI, channelGUI, 0));
m_deviceSet->addChannelInstance(channelName, channelAPI); m_deviceSet->addChannelInstance(channelAPI);
QObject::connect( QObject::connect(
channelGUI, channelGUI,
&ChannelGUI::closing, &ChannelGUI::closing,
@ -109,10 +109,10 @@ void DeviceUISet::registerRxChannelInstance(const QString& channelName, ChannelA
); );
} }
void DeviceUISet::registerTxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI) void DeviceUISet::registerTxChannelInstance(ChannelAPI *channelAPI, ChannelGUI* channelGUI)
{ {
m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, channelGUI, 1)); m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelAPI, channelGUI, 1));
m_deviceSet->addChannelInstance(channelName, channelAPI); m_deviceSet->addChannelInstance(channelAPI);
QObject::connect( QObject::connect(
channelGUI, channelGUI,
&ChannelGUI::closing, &ChannelGUI::closing,
@ -122,10 +122,10 @@ void DeviceUISet::registerTxChannelInstance(const QString& channelName, ChannelA
); );
} }
void DeviceUISet::registerChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI) void DeviceUISet::registerChannelInstance(ChannelAPI *channelAPI, ChannelGUI* channelGUI)
{ {
m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, channelGUI, 2)); m_channelInstanceRegistrations.append(ChannelInstanceRegistration( channelAPI, channelGUI, 2));
m_deviceSet->addChannelInstance(channelName, channelAPI); m_deviceSet->addChannelInstance(channelAPI);
QObject::connect( QObject::connect(
channelGUI, channelGUI,
&ChannelGUI::closing, &ChannelGUI::closing,
@ -139,7 +139,7 @@ void DeviceUISet::freeChannels()
{ {
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++) for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{ {
qDebug("DeviceUISet::freeChannels: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelURI)); qDebug("DeviceUISet::freeChannels: destroying channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
m_channelInstanceRegistrations[i].m_gui->destroy(); m_channelInstanceRegistrations[i].m_gui->destroy();
m_channelInstanceRegistrations[i].m_channelAPI->destroy(); m_channelInstanceRegistrations[i].m_channelAPI->destroy();
} }
@ -152,7 +152,7 @@ void DeviceUISet::deleteChannel(int channelIndex)
if ((channelIndex >= 0) && (channelIndex < m_channelInstanceRegistrations.count())) if ((channelIndex >= 0) && (channelIndex < m_channelInstanceRegistrations.count()))
{ {
qDebug("DeviceUISet::deleteChannel: delete channel [%s] at %d", qDebug("DeviceUISet::deleteChannel: delete channel [%s] at %d",
qPrintable(m_channelInstanceRegistrations[channelIndex].m_channelURI), qPrintable(m_channelInstanceRegistrations[channelIndex].m_channelAPI->getURI()),
channelIndex); channelIndex);
m_channelInstanceRegistrations[channelIndex].m_gui->destroy(); m_channelInstanceRegistrations[channelIndex].m_gui->destroy();
m_channelInstanceRegistrations[channelIndex].m_channelAPI->destroy(); m_channelInstanceRegistrations[channelIndex].m_channelAPI->destroy();
@ -175,7 +175,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++) for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{ {
qDebug("DeviceUISet::loadRxChannelSettings: destroying old channel [%s]", qDebug("DeviceUISet::loadRxChannelSettings: destroying old channel [%s]",
qPrintable(m_channelInstanceRegistrations[i].m_channelURI)); qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
m_channelInstanceRegistrations[i].m_gui->destroy(); // FIXME: stop channel before m_channelInstanceRegistrations[i].m_gui->destroy(); // FIXME: stop channel before
m_channelInstanceRegistrations[i].m_channelAPI->destroy(); m_channelInstanceRegistrations[i].m_channelAPI->destroy();
} }
@ -203,7 +203,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA
BasebandSampleSink *rxChannel; BasebandSampleSink *rxChannel;
(*channelRegistrations)[i].m_plugin->createRxChannel(m_deviceAPI, &rxChannel, &channelAPI); (*channelRegistrations)[i].m_plugin->createRxChannel(m_deviceAPI, &rxChannel, &channelAPI);
rxChannelGUI = (*channelRegistrations)[i].m_plugin->createRxChannelGUI(this, rxChannel); rxChannelGUI = (*channelRegistrations)[i].m_plugin->createRxChannelGUI(this, rxChannel);
registerRxChannelInstance(channelAPI->getURI(), channelAPI, rxChannelGUI); registerRxChannelInstance(channelAPI, rxChannelGUI);
QObject::connect( QObject::connect(
rxChannelGUI, rxChannelGUI,
&ChannelGUI::closing, &ChannelGUI::closing,
@ -236,8 +236,8 @@ void DeviceUISet::saveRxChannelSettings(Preset *preset)
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++) for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{ {
qDebug("DeviceUISet::saveRxChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelURI)); qDebug("DeviceUISet::saveRxChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
preset->addChannel(m_channelInstanceRegistrations[i].m_channelURI, m_channelInstanceRegistrations[i].m_gui->serialize()); preset->addChannel(m_channelInstanceRegistrations[i].m_channelAPI->getURI(), m_channelInstanceRegistrations[i].m_gui->serialize());
} }
} }
else else
@ -260,7 +260,7 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++) for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{ {
qDebug("DeviceUISet::loadTxChannelSettings: destroying old channel [%s]", qDebug("DeviceUISet::loadTxChannelSettings: destroying old channel [%s]",
qPrintable(m_channelInstanceRegistrations[i].m_channelURI)); qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
m_channelInstanceRegistrations[i].m_gui->destroy(); m_channelInstanceRegistrations[i].m_gui->destroy();
m_channelInstanceRegistrations[i].m_channelAPI->destroy(); m_channelInstanceRegistrations[i].m_channelAPI->destroy();
} }
@ -287,7 +287,7 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA
BasebandSampleSource *txChannel; BasebandSampleSource *txChannel;
(*channelRegistrations)[i].m_plugin->createTxChannel(m_deviceAPI, &txChannel, &channelAPI); (*channelRegistrations)[i].m_plugin->createTxChannel(m_deviceAPI, &txChannel, &channelAPI);
txChannelGUI = (*channelRegistrations)[i].m_plugin->createTxChannelGUI(this, txChannel); txChannelGUI = (*channelRegistrations)[i].m_plugin->createTxChannelGUI(this, txChannel);
registerTxChannelInstance(channelAPI->getURI(), channelAPI, txChannelGUI); registerTxChannelInstance(channelAPI, txChannelGUI);
QObject::connect( QObject::connect(
txChannelGUI, txChannelGUI,
&ChannelGUI::closing, &ChannelGUI::closing,
@ -321,8 +321,8 @@ void DeviceUISet::saveTxChannelSettings(Preset *preset)
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++) for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{ {
qDebug("DeviceUISet::saveTxChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelURI)); qDebug("DeviceUISet::saveTxChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
preset->addChannel(m_channelInstanceRegistrations[i].m_channelURI, m_channelInstanceRegistrations[i].m_gui->serialize()); preset->addChannel(m_channelInstanceRegistrations[i].m_channelAPI->getURI(), m_channelInstanceRegistrations[i].m_gui->serialize());
} }
} }
else else
@ -345,7 +345,7 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++) for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{ {
qDebug("DeviceUISet::loadMIMOChannelSettings: destroying old channel [%s]", qDebug("DeviceUISet::loadMIMOChannelSettings: destroying old channel [%s]",
qPrintable(m_channelInstanceRegistrations[i].m_channelURI)); qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
m_channelInstanceRegistrations[i].m_gui->destroy(); // FIXME: stop channel before m_channelInstanceRegistrations[i].m_gui->destroy(); // FIXME: stop channel before
m_channelInstanceRegistrations[i].m_channelAPI->destroy(); m_channelInstanceRegistrations[i].m_channelAPI->destroy();
} }
@ -374,7 +374,7 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi
(*channelRegistrations)[i].m_plugin->createMIMOChannel(m_deviceAPI, &mimoChannel, &channelAPI); (*channelRegistrations)[i].m_plugin->createMIMOChannel(m_deviceAPI, &mimoChannel, &channelAPI);
mimoChannelGUI = (*channelRegistrations)[i].m_plugin->createMIMOChannelGUI(this, mimoChannel); mimoChannelGUI = (*channelRegistrations)[i].m_plugin->createMIMOChannelGUI(this, mimoChannel);
(*channelRegistrations)[i].m_plugin->createMIMOChannel(m_deviceAPI, &mimoChannel, &channelAPI); (*channelRegistrations)[i].m_plugin->createMIMOChannel(m_deviceAPI, &mimoChannel, &channelAPI);
registerChannelInstance(channelAPI->getURI(), channelAPI, mimoChannelGUI); registerChannelInstance(channelAPI, mimoChannelGUI);
QObject::connect( QObject::connect(
mimoChannelGUI, mimoChannelGUI,
&ChannelGUI::closing, &ChannelGUI::closing,
@ -407,8 +407,8 @@ void DeviceUISet::saveMIMOChannelSettings(Preset *preset)
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++) for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{ {
qDebug("DeviceUISet::saveMIMOChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelURI)); qDebug("DeviceUISet::saveMIMOChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI()));
preset->addChannel(m_channelInstanceRegistrations[i].m_channelURI, m_channelInstanceRegistrations[i].m_gui->serialize()); preset->addChannel(m_channelInstanceRegistrations[i].m_channelAPI->getURI(), m_channelInstanceRegistrations[i].m_gui->serialize());
} }
} }
else else

11
sdrgui/device/deviceuiset.h
View File

@ -72,9 +72,9 @@ public:
void saveTxChannelSettings(Preset* preset); void saveTxChannelSettings(Preset* preset);
void loadMIMOChannelSettings(const Preset* preset, PluginAPI *pluginAPI); void loadMIMOChannelSettings(const Preset* preset, PluginAPI *pluginAPI);
void saveMIMOChannelSettings(Preset* preset); void saveMIMOChannelSettings(Preset* preset);
void registerRxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI); void registerRxChannelInstance(ChannelAPI *channelAPI, ChannelGUI* channelGUI);
void registerTxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI); void registerTxChannelInstance(ChannelAPI *channelAPI, ChannelGUI* channelGUI);
void registerChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI); void registerChannelInstance(ChannelAPI *channelAPI, ChannelGUI* channelGUI);
// These are the number of channel types available for selection // These are the number of channel types available for selection
void setNumberOfAvailableRxChannels(int number) { m_nbAvailableRxChannels = number; } void setNumberOfAvailableRxChannels(int number) { m_nbAvailableRxChannels = number; }
@ -87,20 +87,17 @@ public:
private: private:
struct ChannelInstanceRegistration struct ChannelInstanceRegistration
{ {
QString m_channelURI;
ChannelAPI *m_channelAPI; ChannelAPI *m_channelAPI;
ChannelGUI* m_gui; ChannelGUI* m_gui;
int m_channelType; int m_channelType;
ChannelInstanceRegistration() : ChannelInstanceRegistration() :
m_channelURI(),
m_gui(nullptr), m_gui(nullptr),
m_channelAPI(nullptr), m_channelAPI(nullptr),
m_channelType(0) m_channelType(0)
{ } { }
ChannelInstanceRegistration(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI, int channelType) : ChannelInstanceRegistration(ChannelAPI *channelAPI, ChannelGUI* channelGUI, int channelType) :
m_channelURI(channelName),
m_gui(channelGUI), m_gui(channelGUI),
m_channelAPI(channelAPI), m_channelAPI(channelAPI),
m_channelType(channelType) m_channelType(channelType)

8
sdrgui/mainwindow.cpp
View File

@ -1925,7 +1925,7 @@ void MainWindow::channelAddClicked(int channelIndex)
BasebandSampleSink *rxChannel; BasebandSampleSink *rxChannel;
pluginInterface->createRxChannel(deviceUI->m_deviceAPI, &rxChannel, &channelAPI); pluginInterface->createRxChannel(deviceUI->m_deviceAPI, &rxChannel, &channelAPI);
ChannelGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel); 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 else if (deviceUI->m_deviceSinkEngine) // sink device => Tx channels
{ {
@ -1935,7 +1935,7 @@ void MainWindow::channelAddClicked(int channelIndex)
BasebandSampleSource *txChannel; BasebandSampleSource *txChannel;
pluginInterface->createTxChannel(deviceUI->m_deviceAPI, &txChannel, &channelAPI); pluginInterface->createTxChannel(deviceUI->m_deviceAPI, &txChannel, &channelAPI);
ChannelGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel); 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 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; BasebandSampleSink *rxChannel;
pluginInterface->createRxChannel(deviceUI->m_deviceAPI, &rxChannel, &channelAPI); pluginInterface->createRxChannel(deviceUI->m_deviceAPI, &rxChannel, &channelAPI);
ChannelGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel); ChannelGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel);
deviceUI->registerRxChannelInstance(channelAPI->getURI(), channelAPI, gui); deviceUI->registerRxChannelInstance(channelAPI, gui);
} }
else if (channelIndex < nbRxChannels + nbTxChannels) else if (channelIndex < nbRxChannels + nbTxChannels)
{ {
@ -1962,7 +1962,7 @@ void MainWindow::channelAddClicked(int channelIndex)
BasebandSampleSource *txChannel; BasebandSampleSource *txChannel;
pluginInterface->createTxChannel(deviceUI->m_deviceAPI, &txChannel, &channelAPI); pluginInterface->createTxChannel(deviceUI->m_deviceAPI, &txChannel, &channelAPI);
ChannelGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel); ChannelGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel);
deviceUI->registerTxChannelInstance(channelAPI->getURI(), channelAPI, gui); deviceUI->registerTxChannelInstance(channelAPI, gui);
} }
} }
} }