From ef82b891827b67f80bc28da36a54c819cc157f8b Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 1 Aug 2019 21:27:31 +0200 Subject: [PATCH] REST API: config: GET (4): optimize channel settings API management and generally improve constedness --- .../channelrx/chanalyzer/chanalyzerplugin.cpp | 6 ++-- .../channelrx/chanalyzer/chanalyzerplugin.h | 6 ++-- plugins/channelrx/demodam/amdemodplugin.cpp | 8 ++--- plugins/channelrx/demodam/amdemodplugin.h | 6 ++-- plugins/channelrx/demodatv/atvdemodplugin.cpp | 6 ++-- plugins/channelrx/demodatv/atvdemodplugin.h | 6 ++-- plugins/channelrx/demodbfm/bfmplugin.cpp | 8 ++--- plugins/channelrx/demodbfm/bfmplugin.h | 6 ++-- .../channelrx/demoddatv/datvdemodplugin.cpp | 6 ++-- plugins/channelrx/demoddatv/datvdemodplugin.h | 6 ++-- plugins/channelrx/demoddsd/dsddemodplugin.cpp | 8 ++--- plugins/channelrx/demoddsd/dsddemodplugin.h | 6 ++-- .../channelrx/demodfreedv/freedvplugin.cpp | 8 ++--- plugins/channelrx/demodfreedv/freedvplugin.h | 6 ++-- plugins/channelrx/demodlora/loraplugin.cpp | 6 ++-- plugins/channelrx/demodlora/loraplugin.h | 6 ++-- plugins/channelrx/demodnfm/nfmplugin.cpp | 8 ++--- plugins/channelrx/demodnfm/nfmplugin.h | 6 ++-- plugins/channelrx/demodssb/ssbplugin.cpp | 8 ++--- plugins/channelrx/demodssb/ssbplugin.h | 6 ++-- plugins/channelrx/demodwfm/wfmplugin.cpp | 8 ++--- plugins/channelrx/demodwfm/wfmplugin.h | 6 ++-- .../freqtracker/freqtrackerplugin.cpp | 8 ++--- .../channelrx/freqtracker/freqtrackerplugin.h | 6 ++-- .../channelrx/localsink/localsinkplugin.cpp | 8 ++--- plugins/channelrx/localsink/localsinkplugin.h | 6 ++-- .../channelrx/remotesink/remotesinkplugin.cpp | 8 ++--- .../channelrx/remotesink/remotesinkplugin.h | 6 ++-- plugins/channelrx/udpsink/udpsinkplugin.cpp | 8 ++--- plugins/channelrx/udpsink/udpsinkplugin.h | 6 ++-- .../channeltx/filesource/filesourceplugin.cpp | 8 ++--- .../channeltx/filesource/filesourceplugin.h | 6 ++-- .../localsource/localsourceplugin.cpp | 8 ++--- .../channeltx/localsource/localsourceplugin.h | 6 ++-- plugins/channeltx/modam/ammodplugin.cpp | 8 ++--- plugins/channeltx/modam/ammodplugin.h | 6 ++-- plugins/channeltx/modatv/atvmodplugin.cpp | 8 ++--- plugins/channeltx/modatv/atvmodplugin.h | 6 ++-- .../channeltx/modfreedv/freedvmodplugin.cpp | 8 ++--- plugins/channeltx/modfreedv/freedvmodplugin.h | 6 ++-- plugins/channeltx/modnfm/nfmmodplugin.cpp | 8 ++--- plugins/channeltx/modnfm/nfmmodplugin.h | 6 ++-- plugins/channeltx/modssb/ssbmodplugin.cpp | 8 ++--- plugins/channeltx/modssb/ssbmodplugin.h | 6 ++-- plugins/channeltx/modwfm/wfmmodplugin.cpp | 8 ++--- plugins/channeltx/modwfm/wfmmodplugin.h | 6 ++-- .../remotesource/remotesourceplugin.cpp | 8 ++--- .../remotesource/remotesourceplugin.h | 6 ++-- .../channeltx/udpsource/udpsourceplugin.cpp | 8 ++--- plugins/channeltx/udpsource/udpsourceplugin.h | 6 ++-- sdrbase/plugin/plugininterface.h | 16 ++++----- sdrbase/webapi/webapiadapterbase.cpp | 34 ++++++++++++++++--- sdrbase/webapi/webapiadapterbase.h | 13 +++++++ 53 files changed, 220 insertions(+), 185 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp index 8ef33224f..0b9d4c48a 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp @@ -50,17 +50,17 @@ void ChannelAnalyzerPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(ChannelAnalyzer::m_channelIdURI, ChannelAnalyzer::m_channelId, this); } -PluginInstanceGUI* ChannelAnalyzerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* ChannelAnalyzerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return ChannelAnalyzerGUI::create(m_pluginAPI, deviceUISet, rxChannel); } -BasebandSampleSink* ChannelAnalyzerPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* ChannelAnalyzerPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new ChannelAnalyzer(deviceAPI); } -ChannelAPI* ChannelAnalyzerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* ChannelAnalyzerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new ChannelAnalyzer(deviceAPI); } diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.h b/plugins/channelrx/chanalyzer/chanalyzerplugin.h index d6c13707c..313325978 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.h +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.h @@ -36,9 +36,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index 21e62d7d2..ea9738682 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -39,23 +39,23 @@ void AMDemodPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return AMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* AMDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* AMDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new AMDemod(deviceAPI); } -ChannelAPI* AMDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* AMDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new AMDemod(deviceAPI); } diff --git a/plugins/channelrx/demodam/amdemodplugin.h b/plugins/channelrx/demodam/amdemodplugin.h index 0b77eb325..9639cceb7 100644 --- a/plugins/channelrx/demodam/amdemodplugin.h +++ b/plugins/channelrx/demodam/amdemodplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demodatv/atvdemodplugin.cpp b/plugins/channelrx/demodatv/atvdemodplugin.cpp index 74c1451a0..5e8dd490d 100644 --- a/plugins/channelrx/demodatv/atvdemodplugin.cpp +++ b/plugins/channelrx/demodatv/atvdemodplugin.cpp @@ -55,17 +55,17 @@ void ATVDemodPlugin::initPlugin(PluginAPI* ptrPluginAPI) m_ptrPluginAPI->registerRxChannel(ATVDemod::m_channelIdURI, ATVDemod::m_channelId, this); } -PluginInstanceGUI* ATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* ATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return ATVDemodGUI::create(m_ptrPluginAPI, deviceUISet, rxChannel); } -BasebandSampleSink* ATVDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* ATVDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new ATVDemod(deviceAPI); } -ChannelAPI* ATVDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* ATVDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new ATVDemod(deviceAPI); } diff --git a/plugins/channelrx/demodatv/atvdemodplugin.h b/plugins/channelrx/demodatv/atvdemodplugin.h index 55ef3bdb8..1cd5dffbf 100644 --- a/plugins/channelrx/demodatv/atvdemodplugin.h +++ b/plugins/channelrx/demodatv/atvdemodplugin.h @@ -37,9 +37,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* ptrPluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_ptrPluginDescriptor; diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index a22268eea..6df7093e0 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -57,23 +57,23 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* BFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return BFMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* BFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* BFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new BFMDemod(deviceAPI); } -ChannelAPI* BFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* BFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new BFMDemod(deviceAPI); } diff --git a/plugins/channelrx/demodbfm/bfmplugin.h b/plugins/channelrx/demodbfm/bfmplugin.h index ffa974ed2..46f3bb628 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.h +++ b/plugins/channelrx/demodbfm/bfmplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.cpp b/plugins/channelrx/demoddatv/datvdemodplugin.cpp index d0a020701..55c90941b 100644 --- a/plugins/channelrx/demoddatv/datvdemodplugin.cpp +++ b/plugins/channelrx/demoddatv/datvdemodplugin.cpp @@ -56,17 +56,17 @@ void DATVDemodPlugin::initPlugin(PluginAPI* ptrPluginAPI) m_ptrPluginAPI->registerRxChannel(DATVDemod::m_channelIdURI, DATVDemod::m_channelId, this); } -PluginInstanceGUI* DATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* DATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return DATVDemodGUI::create(m_ptrPluginAPI, deviceUISet, rxChannel); } -BasebandSampleSink* DATVDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* DATVDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new DATVDemod(deviceAPI); } -ChannelAPI* DATVDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* DATVDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new DATVDemod(deviceAPI); } diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.h b/plugins/channelrx/demoddatv/datvdemodplugin.h index 76ac1fd17..f1a1b785d 100644 --- a/plugins/channelrx/demoddatv/datvdemodplugin.h +++ b/plugins/channelrx/demoddatv/datvdemodplugin.h @@ -38,9 +38,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* ptrPluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index 861d582af..57b87471d 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -56,23 +56,23 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return DSDDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* DSDDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* DSDDemodPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new DSDDemod(deviceAPI); } -ChannelAPI* DSDDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* DSDDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new DSDDemod(deviceAPI); } diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.h b/plugins/channelrx/demoddsd/dsddemodplugin.h index f922ab0db..46da1394e 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.h +++ b/plugins/channelrx/demoddsd/dsddemodplugin.h @@ -36,9 +36,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodfreedv/freedvplugin.cpp b/plugins/channelrx/demodfreedv/freedvplugin.cpp index 0479e16d0..18de40874 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.cpp +++ b/plugins/channelrx/demodfreedv/freedvplugin.cpp @@ -55,23 +55,23 @@ void FreeDVPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return FreeDVDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* FreeDVPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* FreeDVPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new FreeDVDemod(deviceAPI); } -ChannelAPI* FreeDVPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* FreeDVPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new FreeDVDemod(deviceAPI); } diff --git a/plugins/channelrx/demodfreedv/freedvplugin.h b/plugins/channelrx/demodfreedv/freedvplugin.h index cbe151b6b..c7f744d69 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.h +++ b/plugins/channelrx/demodfreedv/freedvplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodlora/loraplugin.cpp b/plugins/channelrx/demodlora/loraplugin.cpp index 1dff2079e..19d8c4bdc 100644 --- a/plugins/channelrx/demodlora/loraplugin.cpp +++ b/plugins/channelrx/demodlora/loraplugin.cpp @@ -33,17 +33,17 @@ void LoRaPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(LoRaDemod::m_channelIdURI, LoRaDemod::m_channelId, this); } -PluginInstanceGUI* LoRaPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* LoRaPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return LoRaDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } -BasebandSampleSink* LoRaPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* LoRaPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new LoRaDemod(deviceAPI); } -ChannelAPI* LoRaPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* LoRaPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new LoRaDemod(deviceAPI); } diff --git a/plugins/channelrx/demodlora/loraplugin.h b/plugins/channelrx/demodlora/loraplugin.h index cdca99c66..88b8d7705 100644 --- a/plugins/channelrx/demodlora/loraplugin.h +++ b/plugins/channelrx/demodlora/loraplugin.h @@ -18,9 +18,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index 6c9817207..025c6c216 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -38,23 +38,23 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* NFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return NFMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* NFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* NFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new NFMDemod(deviceAPI); } -ChannelAPI* NFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* NFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new NFMDemod(deviceAPI); } diff --git a/plugins/channelrx/demodnfm/nfmplugin.h b/plugins/channelrx/demodnfm/nfmplugin.h index e013dd4df..4f6d4ab9f 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.h +++ b/plugins/channelrx/demodnfm/nfmplugin.h @@ -18,9 +18,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index b882a0253..d04e1a863 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -38,23 +38,23 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* SSBPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return SSBDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* SSBPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* SSBPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new SSBDemod(deviceAPI); } -ChannelAPI* SSBPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* SSBPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new SSBDemod(deviceAPI); } diff --git a/plugins/channelrx/demodssb/ssbplugin.h b/plugins/channelrx/demodssb/ssbplugin.h index 4d83bd1fc..ba7318272 100644 --- a/plugins/channelrx/demodssb/ssbplugin.h +++ b/plugins/channelrx/demodssb/ssbplugin.h @@ -18,9 +18,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index cc84054e2..fda96cf97 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -39,23 +39,23 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* WFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return WFMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* WFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* WFMPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new WFMDemod(deviceAPI); } -ChannelAPI* WFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* WFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new WFMDemod(deviceAPI); } diff --git a/plugins/channelrx/demodwfm/wfmplugin.h b/plugins/channelrx/demodwfm/wfmplugin.h index 44e818c29..38d6d028b 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.h +++ b/plugins/channelrx/demodwfm/wfmplugin.h @@ -18,9 +18,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp index 41760b8fa..a40ca191b 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp @@ -55,23 +55,23 @@ void FreqTrackerPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return FreqTrackerGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* FreqTrackerPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* FreqTrackerPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new FreqTracker(deviceAPI); } -ChannelAPI* FreqTrackerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* FreqTrackerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new FreqTracker(deviceAPI); } diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.h b/plugins/channelrx/freqtracker/freqtrackerplugin.h index da6e1ec1a..b6eb7f57d 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.h +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/localsink/localsinkplugin.cpp b/plugins/channelrx/localsink/localsinkplugin.cpp index 8d89e9fe3..adf031d38 100644 --- a/plugins/channelrx/localsink/localsinkplugin.cpp +++ b/plugins/channelrx/localsink/localsinkplugin.cpp @@ -56,23 +56,23 @@ void LocalSinkPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return LocalSinkGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* LocalSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* LocalSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new LocalSink(deviceAPI); } -ChannelAPI* LocalSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* LocalSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new LocalSink(deviceAPI); } diff --git a/plugins/channelrx/localsink/localsinkplugin.h b/plugins/channelrx/localsink/localsinkplugin.h index 1f0ca72eb..926752f29 100644 --- a/plugins/channelrx/localsink/localsinkplugin.h +++ b/plugins/channelrx/localsink/localsinkplugin.h @@ -36,9 +36,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/remotesink/remotesinkplugin.cpp b/plugins/channelrx/remotesink/remotesinkplugin.cpp index 883baaa52..8c4be73cd 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.cpp +++ b/plugins/channelrx/remotesink/remotesinkplugin.cpp @@ -56,23 +56,23 @@ void RemoteSinkPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return RemoteSinkGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* RemoteSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* RemoteSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new RemoteSink(deviceAPI); } -ChannelAPI* RemoteSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* RemoteSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new RemoteSink(deviceAPI); } diff --git a/plugins/channelrx/remotesink/remotesinkplugin.h b/plugins/channelrx/remotesink/remotesinkplugin.h index 700cc170f..2fb44b673 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.h +++ b/plugins/channelrx/remotesink/remotesinkplugin.h @@ -36,9 +36,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/udpsink/udpsinkplugin.cpp b/plugins/channelrx/udpsink/udpsinkplugin.cpp index 628db8682..c13f3783d 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.cpp +++ b/plugins/channelrx/udpsink/udpsinkplugin.cpp @@ -56,23 +56,23 @@ void UDPSinkPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) +PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return UDPSinkGUI::create(m_pluginAPI, deviceUISet, rxChannel); } #endif -BasebandSampleSink* UDPSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSink* UDPSinkPlugin::createRxChannelBS(DeviceAPI *deviceAPI) const { return new UDPSink(deviceAPI); } -ChannelAPI* UDPSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* UDPSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const { return new UDPSink(deviceAPI); } diff --git a/plugins/channelrx/udpsink/udpsinkplugin.h b/plugins/channelrx/udpsink/udpsinkplugin.h index 39c224707..8164014e3 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.h +++ b/plugins/channelrx/udpsink/udpsinkplugin.h @@ -36,9 +36,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); - virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/filesource/filesourceplugin.cpp b/plugins/channeltx/filesource/filesourceplugin.cpp index 2b010e915..ea5e81467 100644 --- a/plugins/channeltx/filesource/filesourceplugin.cpp +++ b/plugins/channeltx/filesource/filesourceplugin.cpp @@ -55,23 +55,23 @@ void FileSourcePlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* FileSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* FileSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* FileSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return FileSourceGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* FileSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* FileSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new FileSource(deviceAPI); } -ChannelAPI* FileSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* FileSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new FileSource(deviceAPI); } diff --git a/plugins/channeltx/filesource/filesourceplugin.h b/plugins/channeltx/filesource/filesourceplugin.h index 18ca3f425..a74b58034 100644 --- a/plugins/channeltx/filesource/filesourceplugin.h +++ b/plugins/channeltx/filesource/filesourceplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/localsource/localsourceplugin.cpp b/plugins/channeltx/localsource/localsourceplugin.cpp index 10d4ae134..4db49bfc6 100644 --- a/plugins/channeltx/localsource/localsourceplugin.cpp +++ b/plugins/channeltx/localsource/localsourceplugin.cpp @@ -56,23 +56,23 @@ void LocalSourcePlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return LocalSourceGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* LocalSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* LocalSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new LocalSource(deviceAPI); } -ChannelAPI* LocalSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* LocalSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new LocalSource(deviceAPI); } diff --git a/plugins/channeltx/localsource/localsourceplugin.h b/plugins/channeltx/localsource/localsourceplugin.h index 78f1dacc2..9f49f2ad7 100644 --- a/plugins/channeltx/localsource/localsourceplugin.h +++ b/plugins/channeltx/localsource/localsourceplugin.h @@ -36,9 +36,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index 9606e337c..40d8dad49 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -55,23 +55,23 @@ void AMModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* AMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return AMModGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* AMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* AMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new AMMod(deviceAPI); } -ChannelAPI* AMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* AMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new AMMod(deviceAPI); } diff --git a/plugins/channeltx/modam/ammodplugin.h b/plugins/channeltx/modam/ammodplugin.h index 6abd57b46..cd54992e3 100644 --- a/plugins/channeltx/modam/ammodplugin.h +++ b/plugins/channeltx/modam/ammodplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index 44148b181..5c2ac6361 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -55,23 +55,23 @@ void ATVModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* ATVModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return ATVModGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* ATVModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* ATVModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new ATVMod(deviceAPI); } -ChannelAPI* ATVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* ATVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new ATVMod(deviceAPI); } diff --git a/plugins/channeltx/modatv/atvmodplugin.h b/plugins/channeltx/modatv/atvmodplugin.h index 8d24de5a1..1d37c658a 100644 --- a/plugins/channeltx/modatv/atvmodplugin.h +++ b/plugins/channeltx/modatv/atvmodplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.cpp b/plugins/channeltx/modfreedv/freedvmodplugin.cpp index 89516bd98..4921101f0 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.cpp +++ b/plugins/channeltx/modfreedv/freedvmodplugin.cpp @@ -55,23 +55,23 @@ void FreeDVModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return FreeDVModGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* FreeDVModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* FreeDVModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new FreeDVMod(deviceAPI); } -ChannelAPI* FreeDVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* FreeDVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new FreeDVMod(deviceAPI); } diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.h b/plugins/channeltx/modfreedv/freedvmodplugin.h index 9a7659bd8..d84411bc6 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.h +++ b/plugins/channeltx/modfreedv/freedvmodplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index b1af69ec0..770c2b5fa 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -55,23 +55,23 @@ void NFMModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* NFMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return NFMModGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* NFMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* NFMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new NFMMod(deviceAPI); } -ChannelAPI* NFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* NFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new NFMMod(deviceAPI); } diff --git a/plugins/channeltx/modnfm/nfmmodplugin.h b/plugins/channeltx/modnfm/nfmmodplugin.h index acea9b75c..bb3f51317 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.h +++ b/plugins/channeltx/modnfm/nfmmodplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index 6aa35f0ca..2db53fadf 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -55,23 +55,23 @@ void SSBModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* SSBModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return SSBModGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* SSBModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* SSBModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new SSBMod(deviceAPI); } -ChannelAPI* SSBModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* SSBModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new SSBMod(deviceAPI); } diff --git a/plugins/channeltx/modssb/ssbmodplugin.h b/plugins/channeltx/modssb/ssbmodplugin.h index 208e9fb76..82ba8c956 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.h +++ b/plugins/channeltx/modssb/ssbmodplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index 7fe4cc422..23421654b 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -55,23 +55,23 @@ void WFMModPlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* WFMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return WFMModGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* WFMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* WFMModPlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new WFMMod(deviceAPI); } -ChannelAPI* WFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* WFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new WFMMod(deviceAPI); } diff --git a/plugins/channeltx/modwfm/wfmmodplugin.h b/plugins/channeltx/modwfm/wfmmodplugin.h index 5dce75274..2d9647e50 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.h +++ b/plugins/channeltx/modwfm/wfmmodplugin.h @@ -34,9 +34,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/remotesource/remotesourceplugin.cpp b/plugins/channeltx/remotesource/remotesourceplugin.cpp index e3c17b02c..9cdb2dbcf 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.cpp +++ b/plugins/channeltx/remotesource/remotesourceplugin.cpp @@ -55,23 +55,23 @@ void RemoteSourcePlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return RemoteSourceGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* RemoteSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* RemoteSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new RemoteSource(deviceAPI); } -ChannelAPI* RemoteSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* RemoteSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new RemoteSource(deviceAPI); } diff --git a/plugins/channeltx/remotesource/remotesourceplugin.h b/plugins/channeltx/remotesource/remotesourceplugin.h index 10569e6dc..75fece053 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.h +++ b/plugins/channeltx/remotesource/remotesourceplugin.h @@ -35,9 +35,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/udpsource/udpsourceplugin.cpp b/plugins/channeltx/udpsource/udpsourceplugin.cpp index 6b6eebc8c..95bb0bac4 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.cpp +++ b/plugins/channeltx/udpsource/udpsourceplugin.cpp @@ -57,23 +57,23 @@ void UDPSourcePlugin::initPlugin(PluginAPI* pluginAPI) #ifdef SERVER_MODE PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) +PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return UDPSourceGUI::create(m_pluginAPI, deviceUISet, txChannel); } #endif -BasebandSampleSource* UDPSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) +BasebandSampleSource* UDPSourcePlugin::createTxChannelBS(DeviceAPI *deviceAPI) const { return new UDPSource(deviceAPI); } -ChannelAPI* UDPSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) +ChannelAPI* UDPSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const { return new UDPSource(deviceAPI); } diff --git a/plugins/channeltx/udpsource/udpsourceplugin.h b/plugins/channeltx/udpsource/udpsourceplugin.h index ca26b1607..54fe91276 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.h +++ b/plugins/channeltx/udpsource/udpsourceplugin.h @@ -36,9 +36,9 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); - virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI); - virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI); + virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index a923d25b6..9aa133a3a 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -88,22 +88,20 @@ public: virtual PluginInstanceGUI* createRxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSink *rxChannel) + BasebandSampleSink *rxChannel) const { (void) deviceUISet; (void) rxChannel; return nullptr; } - virtual BasebandSampleSink* createRxChannelBS( - DeviceAPI *deviceAPI) + virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const { (void) deviceAPI; return nullptr; } - virtual ChannelAPI* createRxChannelCS( - DeviceAPI *deviceAPI) + virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const { (void) deviceAPI; return nullptr; @@ -113,22 +111,20 @@ public: virtual PluginInstanceGUI* createTxChannelGUI( DeviceUISet *deviceUISet, - BasebandSampleSource *txChannel) + BasebandSampleSource *txChannel) const { (void) deviceUISet; (void) txChannel; return nullptr; } - virtual BasebandSampleSource* createTxChannelBS( - DeviceAPI *deviceAPI) + virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const { (void) deviceAPI; return nullptr; } - virtual ChannelAPI* createTxChannelCS( - DeviceAPI *deviceAPI) + virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const { (void) deviceAPI; return nullptr; diff --git a/sdrbase/webapi/webapiadapterbase.cpp b/sdrbase/webapi/webapiadapterbase.cpp index 1d0bff159..8f0718a61 100644 --- a/sdrbase/webapi/webapiadapterbase.cpp +++ b/sdrbase/webapi/webapiadapterbase.cpp @@ -25,7 +25,9 @@ WebAPIAdapterBase::WebAPIAdapterBase() {} WebAPIAdapterBase::~WebAPIAdapterBase() -{} +{ + m_webAPIChannelAdapters.flush(); +} void WebAPIAdapterBase::webapiFormatPreferences( SWGSDRangel::SWGPreferences *apiPreferences, @@ -69,11 +71,10 @@ void WebAPIAdapterBase::webapiFormatPreset( const QByteArray& channelSettings = channelConfig.m_config; SWGSDRangel::SWGChannelSettings *swgChannelSettings = swgChannelConfigs->back()->getConfig(); swgChannelSettings->init(); - const PluginInterface *pluginInterface = m_pluginManager->getChannelPluginInterface(channelConfig.m_channelIdURI); + ChannelAPI *channelWebAPIAdapter = m_webAPIChannelAdapters.getChannelAPI(channelConfig.m_channelIdURI, m_pluginManager); - if (pluginInterface) // TODO: optimize by caching web API adapters + if (channelWebAPIAdapter) { - ChannelAPI *channelWebAPIAdapter = pluginInterface->createChannelWebAPIAdapter(); channelWebAPIAdapter->deserialize(channelSettings); QString errorMessage; channelWebAPIAdapter->webapiSettingsGet(*swgChannelSettings, errorMessage); @@ -109,4 +110,29 @@ void WebAPIAdapterBase::webapiFormatCommand( apiCommand->setKeyModifiers((int) command.getKeyModifiers()); apiCommand->setAssociateKey(command.getAssociateKey() ? 1 : 0); apiCommand->setRelease(command.getRelease() ? 1 : 0); +} + +ChannelAPI *WebAPIAdapterBase::WebAPIChannelAdapters::getChannelAPI(const QString& channelURI, const PluginManager *pluginManager) +{ + QMap::iterator it = m_webAPIChannelAdapters.find(channelURI); + + if (it == m_webAPIChannelAdapters.end()) + { + ChannelAPI *channelAPI = pluginManager->getChannelPluginInterface(channelURI)->createChannelWebAPIAdapter(); + m_webAPIChannelAdapters.insert(channelURI, channelAPI); + return channelAPI; + } + else + { + return *it; + } +} + +void WebAPIAdapterBase::WebAPIChannelAdapters::flush() +{ + foreach(ChannelAPI *ChannelAPI, m_webAPIChannelAdapters) { + delete ChannelAPI; + } + + m_webAPIChannelAdapters.clear(); } \ No newline at end of file diff --git a/sdrbase/webapi/webapiadapterbase.h b/sdrbase/webapi/webapiadapterbase.h index ce736d444..a013d8bf4 100644 --- a/sdrbase/webapi/webapiadapterbase.h +++ b/sdrbase/webapi/webapiadapterbase.h @@ -19,6 +19,8 @@ #ifndef SDRBASE_WEBAPI_WEBAPIADAPTERBASE_H_ #define SDRBASE_WEBAPI_WEBAPIADAPTERBASE_H_ +#include + #include "export.h" #include "SWGPreferences.h" #include "SWGPreset.h" @@ -28,6 +30,7 @@ #include "commands/command.h" class PluginManager; +class ChannelAPI; /** * Adapter between API and objects in sdrbase library @@ -54,7 +57,17 @@ public: ); private: + class WebAPIChannelAdapters + { + public: + ChannelAPI *getChannelAPI(const QString& channelURI, const PluginManager *pluginManager); + void flush(); + private: + QMap m_webAPIChannelAdapters; + }; + const PluginManager *m_pluginManager; + WebAPIChannelAdapters m_webAPIChannelAdapters; }; #endif // SDRBASE_WEBAPI_WEBAPIADAPTERBASE_H_ \ No newline at end of file