1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 16:34:45 -04:00

Replace separate create channel methods (BS and CS) by a single one combining both interfaces

This commit is contained in:
f4exb
2020-10-01 22:47:30 +02:00
parent dc31bd8c48
commit 77955d4dba
4 changed files with 48 additions and 52 deletions
+22 -36
View File
@@ -19,6 +19,7 @@ struct SDRBASE_API PluginDescriptor {
class PluginAPI;
class DeviceAPI;
class DeviceSet;
class DeviceUISet;
class FeatureUISet;
class WebAPIAdapterInterface;
@@ -125,6 +126,13 @@ public:
// channel Rx plugins
virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const
{
(void) deviceAPI;
(void) bs;
(void) cs;
}
virtual PluginInstanceGUI* createRxChannelGUI(
DeviceUISet *deviceUISet,
BasebandSampleSink *rxChannel) const
@@ -134,20 +142,15 @@ public:
return nullptr;
}
virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const
{
(void) deviceAPI;
return nullptr;
}
virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const
{
(void) deviceAPI;
return nullptr;
}
// channel Tx plugins
virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const
{
(void) deviceAPI;
(void) bs;
(void) cs;
}
virtual PluginInstanceGUI* createTxChannelGUI(
DeviceUISet *deviceUISet,
BasebandSampleSource *txChannel) const
@@ -157,20 +160,15 @@ public:
return nullptr;
}
virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const
{
(void) deviceAPI;
return nullptr;
}
virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const
{
(void) deviceAPI;
return nullptr;
}
// channel MIMO plugins
virtual void createMIMOChannel(DeviceAPI *deviceAPI, MIMOChannel **bs, ChannelAPI **cs) const
{
(void) deviceAPI;
(void) bs;
(void) cs;
}
virtual PluginInstanceGUI* createMIMOChannelGUI(
DeviceUISet *deviceUISet,
MIMOChannel *mimoChannel) const
@@ -180,18 +178,6 @@ public:
return nullptr;
}
virtual MIMOChannel* createMIMOChannelBS(DeviceAPI *deviceAPI) const
{
(void) deviceAPI;
return nullptr;
}
virtual ChannelAPI* createMIMOChannelCS(DeviceAPI *deviceAPI) const
{
(void) deviceAPI;
return nullptr;
}
// any channel
virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const