diff --git a/CMakeLists.txt b/CMakeLists.txt index aefae43f4..2e6133824 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,6 @@ set(sdrbase_SOURCES sdrbase/dsp/devicesamplesink.cpp sdrbase/plugin/pluginapi.cpp - #sdrbase/plugin/plugingui.cpp sdrbase/plugin/plugininterface.cpp sdrbase/plugin/pluginmanager.cpp @@ -295,7 +294,7 @@ set(sdrbase_HEADERS sdrbase/dsp/devicesamplesink.h sdrbase/plugin/pluginapi.h - sdrbase/plugin/plugingui.h + sdrbase/plugin/plugininstanceui.h sdrbase/plugin/plugininterface.h sdrbase/plugin/pluginmanager.h diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index 5fa17eaed..ba446bada 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -17,8 +17,8 @@ #ifndef INCLUDE_CHANNELANALYZERGUI_H #define INCLUDE_CHANNELANALYZERGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -36,7 +36,7 @@ namespace Ui { class ChannelAnalyzerGUI; } -class ChannelAnalyzerGUI : public RollupWidget, public PluginGUI { +class ChannelAnalyzerGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp index d7c2f1d30..da6b09167 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp @@ -33,7 +33,7 @@ void ChannelAnalyzerPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(ChannelAnalyzerGUI::m_channelID, this); } -PluginGUI* ChannelAnalyzerPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* ChannelAnalyzerPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == ChannelAnalyzerGUI::m_channelID) { diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.h b/plugins/channelrx/chanalyzer/chanalyzerplugin.h index 15f2db3b4..02ad6ddaa 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.h +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.h @@ -17,7 +17,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.h b/plugins/channelrx/chanalyzerng/chanalyzernggui.h index b81c1f31d..38334f079 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzernggui.h +++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.h @@ -17,8 +17,8 @@ #ifndef INCLUDE_CHANNELANALYZERNGGUI_H #define INCLUDE_CHANNELANALYZERNGGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -36,7 +36,7 @@ namespace Ui { class ChannelAnalyzerNGGUI; } -class ChannelAnalyzerNGGUI : public RollupWidget, public PluginGUI { +class ChannelAnalyzerNGGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp b/plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp index ea3911b02..d6ad4176c 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp +++ b/plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp @@ -48,7 +48,7 @@ void ChannelAnalyzerNGPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(ChannelAnalyzerNGGUI::m_channelID, this); } -PluginGUI* ChannelAnalyzerNGPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* ChannelAnalyzerNGPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == ChannelAnalyzerNGGUI::m_channelID) { diff --git a/plugins/channelrx/chanalyzerng/chanalyzerngplugin.h b/plugins/channelrx/chanalyzerng/chanalyzerngplugin.h index 65d126e4b..c3536677e 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzerngplugin.h +++ b/plugins/channelrx/chanalyzerng/chanalyzerngplugin.h @@ -34,7 +34,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index 81541b7f6..2aab49e59 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -1,8 +1,8 @@ #ifndef INCLUDE_AMDEMODGUI_H #define INCLUDE_AMDEMODGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -17,7 +17,7 @@ namespace Ui { class AMDemodGUI; } -class AMDemodGUI : public RollupWidget, public PluginGUI { +class AMDemodGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index 3852d7b47..1384d25d1 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -33,7 +33,7 @@ void AMDemodPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(AMDemodGUI::m_channelID, this); } -PluginGUI* AMDemodPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* AMDemodPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == AMDemodGUI::m_channelID) { diff --git a/plugins/channelrx/demodam/amdemodplugin.h b/plugins/channelrx/demodam/amdemodplugin.h index 547fa17f2..adc15d026 100644 --- a/plugins/channelrx/demodam/amdemodplugin.h +++ b/plugins/channelrx/demodam/amdemodplugin.h @@ -33,7 +33,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodatv/atvdemodgui.h b/plugins/channelrx/demodatv/atvdemodgui.h index 08e0b05a0..2efd83adb 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.h +++ b/plugins/channelrx/demodatv/atvdemodgui.h @@ -18,8 +18,8 @@ #ifndef INCLUDE_ATVDEMODGUI_H #define INCLUDE_ATVDEMODGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -36,7 +36,7 @@ namespace Ui class ATVDemodGUI; } -class ATVDemodGUI : public RollupWidget, public PluginGUI +class ATVDemodGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT diff --git a/plugins/channelrx/demodatv/atvdemodplugin.cpp b/plugins/channelrx/demodatv/atvdemodplugin.cpp index 869571a17..8aecf1499 100644 --- a/plugins/channelrx/demodatv/atvdemodplugin.cpp +++ b/plugins/channelrx/demodatv/atvdemodplugin.cpp @@ -53,7 +53,7 @@ void ATVDemodPlugin::initPlugin(PluginAPI* ptrPluginAPI) m_ptrPluginAPI->registerRxChannel(ATVDemodGUI::m_strChannelID, this); } -PluginGUI* ATVDemodPlugin::createRxChannel(const QString& strChannelName, DeviceSourceAPI *ptrDeviceAPI) +PluginInstanceUI* ATVDemodPlugin::createRxChannel(const QString& strChannelName, DeviceSourceAPI *ptrDeviceAPI) { if(strChannelName == ATVDemodGUI::m_strChannelID) { diff --git a/plugins/channelrx/demodatv/atvdemodplugin.h b/plugins/channelrx/demodatv/atvdemodplugin.h index 975dcc8c1..e26d77610 100644 --- a/plugins/channelrx/demodatv/atvdemodplugin.h +++ b/plugins/channelrx/demodatv/atvdemodplugin.h @@ -35,7 +35,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* ptrPluginAPI); - PluginGUI* createRxChannel(const QString& strChannelName, DeviceSourceAPI *ptrDeviceAPI); + PluginInstanceUI* createRxChannel(const QString& strChannelName, DeviceSourceAPI *ptrDeviceAPI); private: static const PluginDescriptor m_ptrPluginDescriptor; diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h index 0409496a9..4f8cda0b6 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.h +++ b/plugins/channelrx/demodbfm/bfmdemodgui.h @@ -18,8 +18,8 @@ #ifndef INCLUDE_BFMDEMODGUI_H #define INCLUDE_BFMDEMODGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -37,7 +37,7 @@ namespace Ui { class BFMDemodGUI; } -class BFMDemodGUI : public RollupWidget, public PluginGUI { +class BFMDemodGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index fec48c649..6eb20bfd3 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -50,7 +50,7 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(BFMDemodGUI::m_channelID, this); } -PluginGUI* BFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* BFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == BFMDemodGUI::m_channelID) { diff --git a/plugins/channelrx/demodbfm/bfmplugin.h b/plugins/channelrx/demodbfm/bfmplugin.h index ab37a1371..0b5fdb8e7 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.h +++ b/plugins/channelrx/demodbfm/bfmplugin.h @@ -34,7 +34,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h index 53b037594..369ef33b3 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.h +++ b/plugins/channelrx/demoddsd/dsddemodgui.h @@ -18,10 +18,10 @@ #ifndef INCLUDE_DSDDEMODGUI_H #define INCLUDE_DSDDEMODGUI_H +#include #include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/dsptypes.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -38,7 +38,7 @@ namespace Ui { class DSDDemodGUI; } -class DSDDemodGUI : public RollupWidget, public PluginGUI { +class DSDDemodGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index eaf2e126f..a3d1c9c4b 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -50,7 +50,7 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(DSDDemodGUI::m_channelID, this); } -PluginGUI* DSDDemodPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* DSDDemodPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == DSDDemodGUI::m_channelID) { diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.h b/plugins/channelrx/demoddsd/dsddemodplugin.h index 347b18c3c..835a85508 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.h +++ b/plugins/channelrx/demoddsd/dsddemodplugin.h @@ -34,7 +34,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodlora/lorademodgui.h b/plugins/channelrx/demodlora/lorademodgui.h index 5bada3b12..3ba35f351 100644 --- a/plugins/channelrx/demodlora/lorademodgui.h +++ b/plugins/channelrx/demodlora/lorademodgui.h @@ -1,8 +1,8 @@ #ifndef INCLUDE_LoRaDEMODGUI_H #define INCLUDE_LoRaDEMODGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #define BANDWIDTHSTRING {7813,15625,20833,31250,62500} @@ -18,7 +18,7 @@ namespace Ui { class LoRaDemodGUI; } -class LoRaDemodGUI : public RollupWidget, public PluginGUI { +class LoRaDemodGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodlora/loraplugin.cpp b/plugins/channelrx/demodlora/loraplugin.cpp index 3139b9570..2f93c2ffb 100644 --- a/plugins/channelrx/demodlora/loraplugin.cpp +++ b/plugins/channelrx/demodlora/loraplugin.cpp @@ -33,7 +33,7 @@ void LoRaPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(LoRaDemodGUI::m_channelID, this); } -PluginGUI* LoRaPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* LoRaPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == LoRaDemodGUI::m_channelID) { diff --git a/plugins/channelrx/demodlora/loraplugin.h b/plugins/channelrx/demodlora/loraplugin.h index e0b83f505..5fa25822d 100644 --- a/plugins/channelrx/demodlora/loraplugin.h +++ b/plugins/channelrx/demodlora/loraplugin.h @@ -17,7 +17,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index 6b3828f10..64e889364 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -1,8 +1,8 @@ #ifndef INCLUDE_NFMDEMODGUI_H #define INCLUDE_NFMDEMODGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/dsptypes.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -18,7 +18,7 @@ namespace Ui { class NFMDemodGUI; } -class NFMDemodGUI : public RollupWidget, public PluginGUI { +class NFMDemodGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index fe6a572c6..f0f218f1b 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -33,7 +33,7 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(NFMDemodGUI::m_channelID, this); } -PluginGUI* NFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* NFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == NFMDemodGUI::m_channelID) { NFMDemodGUI* gui = NFMDemodGUI::create(m_pluginAPI, deviceAPI); diff --git a/plugins/channelrx/demodnfm/nfmplugin.h b/plugins/channelrx/demodnfm/nfmplugin.h index 294c9700b..ff2e822ce 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.h +++ b/plugins/channelrx/demodnfm/nfmplugin.h @@ -17,7 +17,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index 0b2479ab0..51ac1f8e4 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -1,8 +1,8 @@ #ifndef INCLUDE_SSBDEMODGUI_H #define INCLUDE_SSBDEMODGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -19,7 +19,7 @@ namespace Ui { class SSBDemodGUI; } -class SSBDemodGUI : public RollupWidget, public PluginGUI { +class SSBDemodGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index 5615e1e93..a7931ccee 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -33,7 +33,7 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(SSBDemodGUI::m_channelID, this); } -PluginGUI* SSBPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* SSBPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == SSBDemodGUI::m_channelID) { diff --git a/plugins/channelrx/demodssb/ssbplugin.h b/plugins/channelrx/demodssb/ssbplugin.h index 49c5cc43d..5901a3671 100644 --- a/plugins/channelrx/demodssb/ssbplugin.h +++ b/plugins/channelrx/demodssb/ssbplugin.h @@ -17,7 +17,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index a06c550ce..f600869bd 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -1,8 +1,8 @@ #ifndef INCLUDE_WFMDEMODGUI_H #define INCLUDE_WFMDEMODGUI_H +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -17,7 +17,7 @@ namespace Ui { class WFMDemodGUI; } -class WFMDemodGUI : public RollupWidget, public PluginGUI { +class WFMDemodGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index aeb9c76fd..bb620ff0f 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -33,7 +33,7 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(WFMDemodGUI::m_channelID, this); } -PluginGUI* WFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* WFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == WFMDemodGUI::m_channelID) { diff --git a/plugins/channelrx/demodwfm/wfmplugin.h b/plugins/channelrx/demodwfm/wfmplugin.h index e933c4393..84a06fe18 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.h +++ b/plugins/channelrx/demodwfm/wfmplugin.h @@ -17,7 +17,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.h b/plugins/channelrx/tcpsrc/tcpsrcgui.h index 4fc71e369..cb6a7512e 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcgui.h +++ b/plugins/channelrx/tcpsrc/tcpsrcgui.h @@ -1,9 +1,9 @@ #ifndef INCLUDE_TCPSRCGUI_H #define INCLUDE_TCPSRCGUI_H +#include #include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -20,7 +20,7 @@ namespace Ui { class TCPSrcGUI; } -class TCPSrcGUI : public RollupWidget, public PluginGUI { +class TCPSrcGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp b/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp index 290e8b5af..8c5d2b6fe 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp @@ -33,7 +33,7 @@ void TCPSrcPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(TCPSrcGUI::m_channelID, this); } -PluginGUI* TCPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* TCPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == TCPSrcGUI::m_channelID) { diff --git a/plugins/channelrx/tcpsrc/tcpsrcplugin.h b/plugins/channelrx/tcpsrc/tcpsrcplugin.h index a8d8efa0c..19224b73a 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcplugin.h +++ b/plugins/channelrx/tcpsrc/tcpsrcplugin.h @@ -17,7 +17,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/udpsrc/udpsrcgui.h b/plugins/channelrx/udpsrc/udpsrcgui.h index 04f0dc535..7b1892691 100644 --- a/plugins/channelrx/udpsrc/udpsrcgui.h +++ b/plugins/channelrx/udpsrc/udpsrcgui.h @@ -18,9 +18,9 @@ #ifndef INCLUDE_UDPSRCGUI_H #define INCLUDE_UDPSRCGUI_H +#include #include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -37,7 +37,7 @@ namespace Ui { class UDPSrcGUI; } -class UDPSrcGUI : public RollupWidget, public PluginGUI { +class UDPSrcGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channelrx/udpsrc/udpsrcplugin.cpp b/plugins/channelrx/udpsrc/udpsrcplugin.cpp index 622332107..1940602f5 100644 --- a/plugins/channelrx/udpsrc/udpsrcplugin.cpp +++ b/plugins/channelrx/udpsrc/udpsrcplugin.cpp @@ -50,7 +50,7 @@ void UDPSrcPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerRxChannel(UDPSrcGUI::m_channelID, this); } -PluginGUI* UDPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* UDPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { if(channelName == UDPSrcGUI::m_channelID) { diff --git a/plugins/channelrx/udpsrc/udpsrcplugin.h b/plugins/channelrx/udpsrc/udpsrcplugin.h index 1180384d3..39707665b 100644 --- a/plugins/channelrx/udpsrc/udpsrcplugin.h +++ b/plugins/channelrx/udpsrc/udpsrcplugin.h @@ -34,7 +34,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); + PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modam/ammodgui.h b/plugins/channeltx/modam/ammodgui.h index 6e8c5d8bb..d7f8cbf63 100644 --- a/plugins/channeltx/modam/ammodgui.h +++ b/plugins/channeltx/modam/ammodgui.h @@ -17,8 +17,8 @@ #ifndef PLUGINS_CHANNELTX_MODAM_AMMODGUI_H_ #define PLUGINS_CHANNELTX_MODAM_AMMODGUI_H_ +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "ammod.h" @@ -34,7 +34,7 @@ namespace Ui { class AMModGUI; } -class AMModGUI : public RollupWidget, public PluginGUI { +class AMModGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index 90acaa704..96b269ed8 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -49,7 +49,7 @@ void AMModPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerTxChannel(AMModGUI::m_channelID, this); } -PluginGUI* AMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* AMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) { if(channelName == AMModGUI::m_channelID) { diff --git a/plugins/channeltx/modam/ammodplugin.h b/plugins/channeltx/modam/ammodplugin.h index da8a3fb11..9a87c0012 100644 --- a/plugins/channeltx/modam/ammodplugin.h +++ b/plugins/channeltx/modam/ammodplugin.h @@ -33,7 +33,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); + PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modatv/atvmodgui.h b/plugins/channeltx/modatv/atvmodgui.h index c8ee965be..f37f6a455 100644 --- a/plugins/channeltx/modatv/atvmodgui.h +++ b/plugins/channeltx/modatv/atvmodgui.h @@ -17,8 +17,8 @@ #ifndef PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_ #define PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_ +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "atvmod.h" @@ -35,7 +35,7 @@ namespace Ui { class ATVModGUI; } -class ATVModGUI : public RollupWidget, public PluginGUI { +class ATVModGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index 67a2c5a3d..5e5e4156e 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -49,7 +49,7 @@ void ATVModPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerTxChannel(ATVModGUI::m_channelID, this); } -PluginGUI* ATVModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* ATVModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) { if(channelName == ATVModGUI::m_channelID) { diff --git a/plugins/channeltx/modatv/atvmodplugin.h b/plugins/channeltx/modatv/atvmodplugin.h index 7e3cb51ba..de2c6ec57 100644 --- a/plugins/channeltx/modatv/atvmodplugin.h +++ b/plugins/channeltx/modatv/atvmodplugin.h @@ -33,7 +33,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); + PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modnfm/nfmmodgui.h b/plugins/channeltx/modnfm/nfmmodgui.h index 7a638bb97..cdde2ec48 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.h +++ b/plugins/channeltx/modnfm/nfmmodgui.h @@ -17,8 +17,8 @@ #ifndef PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_ #define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_ +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -35,7 +35,7 @@ namespace Ui { class NFMModGUI; } -class NFMModGUI : public RollupWidget, public PluginGUI { +class NFMModGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index 68b9cb7c4..2f876202f 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -49,7 +49,7 @@ void NFMModPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerTxChannel(NFMModGUI::m_channelID, this); } -PluginGUI* NFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* NFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) { if(channelName == NFMModGUI::m_channelID) { diff --git a/plugins/channeltx/modnfm/nfmmodplugin.h b/plugins/channeltx/modnfm/nfmmodplugin.h index 79d8d9438..6fa9d098d 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.h +++ b/plugins/channeltx/modnfm/nfmmodplugin.h @@ -33,7 +33,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); + PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modssb/ssbmodgui.h b/plugins/channeltx/modssb/ssbmodgui.h index ddc04c3be..cb377558d 100644 --- a/plugins/channeltx/modssb/ssbmodgui.h +++ b/plugins/channeltx/modssb/ssbmodgui.h @@ -17,8 +17,8 @@ #ifndef PLUGINS_CHANNELTX_MODSSB_SSBMODGUI_H_ #define PLUGINS_CHANNELTX_MODSSB_SSBMODGUI_H_ +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "ssbmod.h" @@ -35,7 +35,7 @@ namespace Ui { class SSBModGUI; } -class SSBModGUI : public RollupWidget, public PluginGUI { +class SSBModGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index 82d8c681a..e616cd916 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -49,7 +49,7 @@ void SSBModPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerTxChannel(SSBModGUI::m_channelID, this); } -PluginGUI* SSBModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* SSBModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) { if(channelName == SSBModGUI::m_channelID) { diff --git a/plugins/channeltx/modssb/ssbmodplugin.h b/plugins/channeltx/modssb/ssbmodplugin.h index a081e9d54..3b58e24ab 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.h +++ b/plugins/channeltx/modssb/ssbmodplugin.h @@ -33,7 +33,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); + PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modwfm/wfmmodgui.h b/plugins/channeltx/modwfm/wfmmodgui.h index 4616386b7..32cfb2af5 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.h +++ b/plugins/channeltx/modwfm/wfmmodgui.h @@ -17,8 +17,8 @@ #ifndef PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_ #define PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_ +#include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -35,7 +35,7 @@ namespace Ui { class WFMModGUI; } -class WFMModGUI : public RollupWidget, public PluginGUI { +class WFMModGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index 486077437..0b08dd2ef 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -49,7 +49,7 @@ void WFMModPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerTxChannel(WFMModGUI::m_channelID, this); } -PluginGUI* WFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* WFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) { if(channelName == WFMModGUI::m_channelID) { diff --git a/plugins/channeltx/modwfm/wfmmodplugin.h b/plugins/channeltx/modwfm/wfmmodplugin.h index ed4465045..48616d21d 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.h +++ b/plugins/channeltx/modwfm/wfmmodplugin.h @@ -33,7 +33,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); + PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/udpsink/udpsinkgui.h b/plugins/channeltx/udpsink/udpsinkgui.h index 88c9d89d2..de5193203 100644 --- a/plugins/channeltx/udpsink/udpsinkgui.h +++ b/plugins/channeltx/udpsink/udpsinkgui.h @@ -17,10 +17,10 @@ #ifndef PLUGINS_CHANNELTX_UDPSINK_UDPSINKGUI_H_ #define PLUGINS_CHANNELTX_UDPSINK_UDPSINKGUI_H_ +#include #include #include "gui/rollupwidget.h" -#include "plugin/plugingui.h" #include "dsp/channelmarker.h" #include "udpsink.h" @@ -36,7 +36,7 @@ namespace Ui { class UDPSinkGUI; } -class UDPSinkGUI : public RollupWidget, public PluginGUI { +class UDPSinkGUI : public RollupWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/channeltx/udpsink/udpsinkplugin.cpp b/plugins/channeltx/udpsink/udpsinkplugin.cpp index d78a87d07..88b7ff3d8 100644 --- a/plugins/channeltx/udpsink/udpsinkplugin.cpp +++ b/plugins/channeltx/udpsink/udpsinkplugin.cpp @@ -50,7 +50,7 @@ void UDPSinkPlugin::initPlugin(PluginAPI* pluginAPI) m_pluginAPI->registerTxChannel(UDPSinkGUI::m_channelID, this); } -PluginGUI* UDPSinkPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* UDPSinkPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) { if(channelName == UDPSinkGUI::m_channelID) { diff --git a/plugins/channeltx/udpsink/udpsinkplugin.h b/plugins/channeltx/udpsink/udpsinkplugin.h index 2ca6624df..e56d94318 100644 --- a/plugins/channeltx/udpsink/udpsinkplugin.h +++ b/plugins/channeltx/udpsink/udpsinkplugin.h @@ -34,7 +34,7 @@ public: const PluginDescriptor& getPluginDescriptor() const; void initPlugin(PluginAPI* pluginAPI); - PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); + PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h index bb6f837bf..1e8039da4 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h @@ -17,11 +17,10 @@ #ifndef INCLUDE_BLADERFOUTPUTGUI_H #define INCLUDE_BLADERFOUTPUTGUI_H +#include #include #include -#include "plugin/plugingui.h" - #include "bladerfoutput.h" class DeviceSinkAPI; @@ -32,7 +31,7 @@ namespace Ui { class BladerfOutputGui; } -class BladerfOutputGui : public QWidget, public PluginGUI { +class BladerfOutputGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp index c422517ed..d2daa5a7c 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp @@ -77,7 +77,7 @@ PluginInterface::SamplingDevices BladerfOutputPlugin::enumSampleSinks() return result; } -PluginGUI* BladerfOutputPlugin::createSampleSinkPluginGUI(const QString& sinkId,QWidget **widget, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* BladerfOutputPlugin::createSampleSinkPluginGUI(const QString& sinkId,QWidget **widget, DeviceSinkAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.h b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.h index 9337354f2..99b6bbf12 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.h +++ b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSinks(); - virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/filesink/filesinkgui.h b/plugins/samplesink/filesink/filesinkgui.h index b0165d4ae..af914e9c7 100644 --- a/plugins/samplesink/filesink/filesinkgui.h +++ b/plugins/samplesink/filesink/filesinkgui.h @@ -17,12 +17,12 @@ #ifndef INCLUDE_FILESINKGUI_H #define INCLUDE_FILESINKGUI_H +#include #include #include #include "filesinkoutput.h" #include "filesinksettings.h" -#include "plugin/plugingui.h" class DeviceSinkAPI; @@ -32,7 +32,7 @@ namespace Ui { class FileSinkGui; } -class FileSinkGui : public QWidget, public PluginGUI { +class FileSinkGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesink/filesink/filesinkplugin.cpp b/plugins/samplesink/filesink/filesinkplugin.cpp index 1607117e9..41ba3f9a5 100644 --- a/plugins/samplesink/filesink/filesinkplugin.cpp +++ b/plugins/samplesink/filesink/filesinkplugin.cpp @@ -69,7 +69,7 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks() return result; } -PluginGUI* FileSinkPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* FileSinkPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/filesink/filesinkplugin.h b/plugins/samplesink/filesink/filesinkplugin.h index c57ba173c..a042efaa2 100644 --- a/plugins/samplesink/filesink/filesinkplugin.h +++ b/plugins/samplesink/filesink/filesinkplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSinks(); - virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h index 9a0a0ebf9..44e2099ed 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h @@ -17,10 +17,10 @@ #ifndef INCLUDE_HACKRFOUTPUTGUI_H #define INCLUDE_HACKRFOUTPUTGUI_H +#include #include #include -#include "plugin/plugingui.h" #include "hackrfoutput.h" #define HACKRF_MAX_DEVICE (32) @@ -32,7 +32,7 @@ namespace Ui { class HackRFOutputGui; } -class HackRFOutputGui : public QWidget, public PluginGUI { +class HackRFOutputGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp index a98f53290..cabbbfcf9 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp @@ -116,7 +116,7 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks() return result; } -PluginGUI* HackRFOutputPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* HackRFOutputPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h index 3e824c81a..33ef85bfb 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSinks(); - virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.h b/plugins/samplesink/limesdroutput/limesdroutputgui.h index 5d662253f..bc78a53b1 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.h +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h @@ -17,10 +17,10 @@ #ifndef PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTGUI_H_ #define PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTGUI_H_ +#include #include #include -#include "plugin/plugingui.h" #include "limesdroutput.h" class DeviceSinkAPI; @@ -31,7 +31,7 @@ namespace Ui { class LimeSDROutputGUI; } -class LimeSDROutputGUI : public QWidget, public PluginGUI { +class LimeSDROutputGUI : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index 112126894..3c6e4fb85 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -96,7 +96,7 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks() return result; } -PluginGUI* LimeSDROutputPlugin::createSampleSinkPluginGUI(const QString& sinkId,QWidget **widget, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* LimeSDROutputPlugin::createSampleSinkPluginGUI(const QString& sinkId,QWidget **widget, DeviceSinkAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.h b/plugins/samplesink/limesdroutput/limesdroutputplugin.h index 3e631598e..a9e082d40 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.h +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSinks(); - virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h index c3922f78f..dc2d7e495 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h @@ -17,11 +17,11 @@ #ifndef INCLUDE_SDRDAEMONSINKGUI_H #define INCLUDE_SDRDAEMONSINKGUI_H +#include #include #include #include -#include "plugin/plugingui.h" #include "sdrdaemonsinksettings.h" #include "sdrdaemonsinkoutput.h" @@ -33,7 +33,7 @@ namespace Ui { class SDRdaemonSinkGui; } -class SDRdaemonSinkGui : public QWidget, public PluginGUI { +class SDRdaemonSinkGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp index 8d731965b..f190b6a8f 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp @@ -70,7 +70,7 @@ PluginInterface::SamplingDevices SDRdaemonSinkPlugin::enumSampleSinks() return result; } -PluginGUI* SDRdaemonSinkPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI) +PluginInstanceUI* SDRdaemonSinkPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI) { if(sinkId == m_deviceTypeID) { diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.h index 0115883e9..6a1c6920a 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.h +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSinks(); - virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h index c8fda15c0..665233628 100644 --- a/plugins/samplesource/airspy/airspygui.h +++ b/plugins/samplesource/airspy/airspygui.h @@ -17,11 +17,11 @@ #ifndef INCLUDE_AIRSPYGUI_H #define INCLUDE_AIRSPYGUI_H +#include #include #include #include "airspyinput.h" -#include "plugin/plugingui.h" #define AIRSPY_MAX_DEVICE (32) @@ -33,7 +33,7 @@ namespace Ui { class AirspySampleRates; } -class AirspyGui : public QWidget, public PluginGUI { +class AirspyGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp index 125a5fd3f..1e73a3b7e 100644 --- a/plugins/samplesource/airspy/airspyplugin.cpp +++ b/plugins/samplesource/airspy/airspyplugin.cpp @@ -119,7 +119,7 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources() return result; } -PluginGUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if (sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/airspy/airspyplugin.h b/plugins/samplesource/airspy/airspyplugin.h index 7c9a328b2..40a8f1027 100644 --- a/plugins/samplesource/airspy/airspyplugin.h +++ b/plugins/samplesource/airspy/airspyplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.h b/plugins/samplesource/bladerfinput/bladerfinputgui.h index 7608e88b8..6d7e737dd 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputgui.h +++ b/plugins/samplesource/bladerfinput/bladerfinputgui.h @@ -17,10 +17,10 @@ #ifndef INCLUDE_BLADERFINPUTGUI_H #define INCLUDE_BLADERFINPUTGUI_H +#include #include #include -#include "plugin/plugingui.h" #include "bladerfinput.h" class DeviceSourceAPI; @@ -30,7 +30,7 @@ namespace Ui { class BladerfInputGui; } -class BladerfInputGui : public QWidget, public PluginGUI { +class BladerfInputGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp index 1d3c87900..0c5fb892f 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp @@ -78,7 +78,7 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources() return result; } -PluginGUI* BlderfInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* BlderfInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.h b/plugins/samplesource/bladerfinput/bladerfinputplugin.h index 1d21e6fd8..b2ea87bdf 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputplugin.h +++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h index ee2f693b5..dba35177a 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -17,11 +17,11 @@ #ifndef INCLUDE_FCDPROGUI_H #define INCLUDE_FCDPROGUI_H +#include #include #include #include "fcdproinput.h" -#include "plugin/plugingui.h" class DeviceSourceAPI; class FileRecord; @@ -31,7 +31,7 @@ namespace Ui { class FCDProGui; } -class FCDProGui : public QWidget, public PluginGUI { +class FCDProGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/fcdpro/fcdproplugin.cpp b/plugins/samplesource/fcdpro/fcdproplugin.cpp index 7d6f9b6f0..16d03adc1 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.cpp +++ b/plugins/samplesource/fcdpro/fcdproplugin.cpp @@ -74,7 +74,7 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources() return result; } -PluginGUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == fcd_traits::interfaceIID) { diff --git a/plugins/samplesource/fcdpro/fcdproplugin.h b/plugins/samplesource/fcdpro/fcdproplugin.h index 9d7b9c8d9..a93a96567 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.h +++ b/plugins/samplesource/fcdpro/fcdproplugin.h @@ -20,7 +20,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h index 19e1d997b..c3195d2a3 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -17,11 +17,11 @@ #ifndef INCLUDE_FCDGUI_H #define INCLUDE_FCDGUI_H +#include #include #include #include "fcdproplusinput.h" -#include "plugin/plugingui.h" class DeviceSourceAPI; class FileRecord; @@ -30,7 +30,7 @@ namespace Ui { class FCDProPlusGui; } -class FCDProPlusGui : public QWidget, public PluginGUI { +class FCDProPlusGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp index 2e1ed6d24..35977e3f6 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp @@ -76,7 +76,7 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources() return result; } -PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == fcd_traits::interfaceIID) { diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.h b/plugins/samplesource/fcdproplus/fcdproplusplugin.h index 583e3a993..386b0c18b 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.h +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.h @@ -20,7 +20,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_deviceTypeID; diff --git a/plugins/samplesource/filesource/filesourcegui.h b/plugins/samplesource/filesource/filesourcegui.h index 1f3d2fba5..52cbab908 100644 --- a/plugins/samplesource/filesource/filesourcegui.h +++ b/plugins/samplesource/filesource/filesourcegui.h @@ -17,11 +17,10 @@ #ifndef INCLUDE_FILESOURCEGUI_H #define INCLUDE_FILESOURCEGUI_H +#include #include #include -#include "plugin/plugingui.h" - #include "filesourceinput.h" class DeviceSourceAPI; @@ -30,7 +29,7 @@ namespace Ui { class FileSourceGui; } -class FileSourceGui : public QWidget, public PluginGUI { +class FileSourceGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index 82bf6fdcf..de3707028 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -69,7 +69,7 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources() return result; } -PluginGUI* FileSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* FileSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/filesource/filesourceplugin.h b/plugins/samplesource/filesource/filesourceplugin.h index 11ae4963b..8b119a7b1 100644 --- a/plugins/samplesource/filesource/filesourceplugin.h +++ b/plugins/samplesource/filesource/filesourceplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.h b/plugins/samplesource/hackrfinput/hackrfinputgui.h index 2604ddbba..5560167a3 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.h +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h @@ -17,10 +17,10 @@ #ifndef INCLUDE_HACKRFINPUTGUI_H #define INCLUDE_HACKRFINPUTGUI_H +#include #include #include -#include "plugin/plugingui.h" #include "../hackrfinput/hackrfinput.h" #define HACKRF_MAX_DEVICE (32) @@ -32,7 +32,7 @@ namespace Ui { class HackRFInputGui; } -class HackRFInputGui : public QWidget, public PluginGUI { +class HackRFInputGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index fe7ae1cc6..3e5a9d2eb 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -117,7 +117,7 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources() return result; } -PluginGUI* HackRFInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* HackRFInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.h b/plugins/samplesource/hackrfinput/hackrfinputplugin.h index 11af13592..d7e75e3a4 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.h +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.h b/plugins/samplesource/limesdrinput/limesdrinputgui.h index 29a402030..82078a736 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.h +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.h @@ -17,10 +17,10 @@ #ifndef PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_ #define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_ +#include #include #include -#include "plugin/plugingui.h" #include "limesdrinput.h" class DeviceSourceAPI; @@ -30,7 +30,7 @@ namespace Ui { class LimeSDRInputGUI; } -class LimeSDRInputGUI : public QWidget, public PluginGUI { +class LimeSDRInputGUI : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index e35b6076c..8f46a2bde 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -97,7 +97,7 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources() return result; } -PluginGUI* LimeSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* LimeSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.h b/plugins/samplesource/limesdrinput/limesdrinputplugin.h index 59f715064..b9d2f4552 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.h +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h index 26bd15c93..da0dd7d7e 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h @@ -17,15 +17,15 @@ #ifndef PLUGINS_SAMPLESOURCE_PLUTOSDRINPUT_PLUTOSDRINPUTGUI_H_ #define PLUGINS_SAMPLESOURCE_PLUTOSDRINPUT_PLUTOSDRINPUTGUI_H_ +#include #include #include -#include "plugin/plugingui.h" #include "plutosdrinputsettings.h" class DeviceSourceAPI; -class PlutoSDRInputGui : public QWidget, public PluginGUI { +class PlutoSDRInputGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp index 93b9a50b5..fb0744d37 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp @@ -80,7 +80,7 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources() return result; } -PluginGUI* PlutoSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* PlutoSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h index 2d4ce109a..822cba6fa 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h index 33a690542..bce1298ea 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.h +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h @@ -17,10 +17,10 @@ #ifndef INCLUDE_RTLSDRGUI_H #define INCLUDE_RTLSDRGUI_H +#include #include #include -#include "plugin/plugingui.h" #include "rtlsdrinput.h" class DeviceSourceAPI; @@ -31,7 +31,7 @@ namespace Ui { class RTLSDRSampleRates; } -class RTLSDRGui : public QWidget, public PluginGUI { +class RTLSDRGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index 7b3e734fa..f9274c812 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -62,7 +62,7 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources() return result; } -PluginGUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { RTLSDRGui* gui = new RTLSDRGui(deviceAPI); diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.h b/plugins/samplesource/rtlsdr/rtlsdrplugin.h index de176a9c9..096470d13 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.h +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.h @@ -20,7 +20,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.h b/plugins/samplesource/sdrdaemon/sdrdaemongui.h index af50caf08..4df6599ee 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.h @@ -17,12 +17,11 @@ #ifndef INCLUDE_SDRDAEMONGUI_H #define INCLUDE_SDRDAEMONGUI_H +#include #include #include #include -#include "plugin/plugingui.h" - #include "sdrdaemoninput.h" class DeviceSourceAPI; @@ -32,7 +31,7 @@ namespace Ui { class SDRdaemonGui; } -class SDRdaemonGui : public QWidget, public PluginGUI { +class SDRdaemonGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp index f2168c02c..076c928d6 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp @@ -69,7 +69,7 @@ PluginInterface::SamplingDevices SDRdaemonPlugin::enumSampleSources() return result; } -PluginGUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h index b71a1ec0f..93818ccbd 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h index c539c8d20..37fa25584 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h @@ -17,12 +17,11 @@ #ifndef INCLUDE_SDRDAEMONSOURCEGUI_H #define INCLUDE_SDRDAEMONSOURCEGUI_H +#include #include #include #include -#include "plugin/plugingui.h" - #include "sdrdaemonsourceinput.h" class DeviceSourceAPI; @@ -32,7 +31,7 @@ namespace Ui { class SDRdaemonSourceGui; } -class SDRdaemonSourceGui : public QWidget, public PluginGUI { +class SDRdaemonSourceGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp index b61c91c5f..7522b2628 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp @@ -70,7 +70,7 @@ PluginInterface::SamplingDevices SDRdaemonSourcePlugin::enumSampleSources() return result; } -PluginGUI* SDRdaemonSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* SDRdaemonSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h index 9f31b7b12..5921fa061 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/plugins/samplesource/sdrplay/sdrplaygui.h b/plugins/samplesource/sdrplay/sdrplaygui.h index 3f3bf4fc9..e727c736b 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.h +++ b/plugins/samplesource/sdrplay/sdrplaygui.h @@ -17,12 +17,11 @@ #ifndef PLUGINS_SAMPLESOURCE_SDRPLAY_SDRPLAYGUI_H_ #define PLUGINS_SAMPLESOURCE_SDRPLAY_SDRPLAYGUI_H_ +#include #include #include #include -#include "plugin/plugingui.h" - #include "sdrplayinput.h" #include "sdrplaysettings.h" @@ -34,7 +33,7 @@ namespace Ui { class SDRPlayGui; } -class SDRPlayGui : public QWidget, public PluginGUI { +class SDRPlayGui : public QWidget, public PluginInstanceUI { Q_OBJECT public: diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp index 58cf29ed2..9e15b0a39 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp +++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp @@ -83,7 +83,7 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources() return result; } -PluginGUI* SDRPlayPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI) +PluginInstanceUI* SDRPlayPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI) { if(sourceId == m_deviceTypeID) { diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.h b/plugins/samplesource/sdrplay/sdrplayplugin.h index 25e8c1365..fc3e9c044 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.h +++ b/plugins/samplesource/sdrplay/sdrplayplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual SamplingDevices enumSampleSources(); - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI); static const QString m_hardwareID; static const QString m_deviceTypeID; diff --git a/sdrbase/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp index 9120d534c..8b5a50f7d 100644 --- a/sdrbase/device/devicesinkapi.cpp +++ b/sdrbase/device/devicesinkapi.cpp @@ -14,9 +14,9 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include #include "device/devicesinkapi.h" #include "device/devicesourceapi.h" -#include "plugin/plugingui.h" #include "plugin/pluginapi.h" #include "plugin/plugininterface.h" #include "gui/glspectrum.h" @@ -170,7 +170,7 @@ void DeviceSinkAPI::setSampleSinkSequence(int sequence) m_deviceSinkEngine->setSinkSequence(sequence); } -void DeviceSinkAPI::setSampleSinkPluginGUI(PluginGUI *gui) +void DeviceSinkAPI::setSampleSinkPluginGUI(PluginInstanceUI *gui) { if (m_sampleSinkPluginGUI != 0) { @@ -181,13 +181,13 @@ void DeviceSinkAPI::setSampleSinkPluginGUI(PluginGUI *gui) m_sampleSinkPluginGUI = gui; } -void DeviceSinkAPI::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI) +void DeviceSinkAPI::registerChannelInstance(const QString& channelName, PluginInstanceUI* pluginGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, pluginGUI)); renameChannelInstances(); } -void DeviceSinkAPI::removeChannelInstance(PluginGUI* pluginGUI) +void DeviceSinkAPI::removeChannelInstance(PluginInstanceUI* pluginGUI) { for(ChannelInstanceRegistrations::iterator it = m_channelInstanceRegistrations.begin(); it != m_channelInstanceRegistrations.end(); ++it) { diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h index 6fa1cd1cb..d56a69df5 100644 --- a/sdrbase/device/devicesinkapi.h +++ b/sdrbase/device/devicesinkapi.h @@ -32,7 +32,7 @@ class DeviceSampleSink; class MessageQueue; class ChannelMarker; class QWidget; -class PluginGUI; +class PluginInstanceUI; class PluginAPI; class Preset; class DeviceSourceAPI; @@ -69,15 +69,15 @@ public: void setSampleSinkId(const QString& id); void setSampleSinkSerial(const QString& serial); void setSampleSinkSequence(int sequence); - void setSampleSinkPluginGUI(PluginGUI *gui); + void setSampleSinkPluginGUI(PluginInstanceUI *gui); const QString& getHardwareId() const { return m_hardwareId; } const QString& getSampleSinkId() const { return m_sampleSinkId; } const QString& getSampleSinkSerial() const { return m_sampleSinkSerial; } uint32_t getSampleSinkSequence() const { return m_sampleSinkSequence; } - void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI); - void removeChannelInstance(PluginGUI* pluginGUI); + void registerChannelInstance(const QString& channelName, PluginInstanceUI* pluginGUI); + void removeChannelInstance(PluginInstanceUI* pluginGUI); void freeAll(); @@ -105,14 +105,14 @@ protected: struct ChannelInstanceRegistration { QString m_channelName; - PluginGUI* m_gui; + PluginInstanceUI* m_gui; ChannelInstanceRegistration() : m_channelName(), m_gui(0) { } - ChannelInstanceRegistration(const QString& channelName, PluginGUI* pluginGUI) : + ChannelInstanceRegistration(const QString& channelName, PluginInstanceUI* pluginGUI) : m_channelName(channelName), m_gui(pluginGUI) { } @@ -141,7 +141,7 @@ protected: QString m_sampleSinkId; QString m_sampleSinkSerial; uint32_t m_sampleSinkSequence; - PluginGUI* m_sampleSinkPluginGUI; + PluginInstanceUI* m_sampleSinkPluginGUI; ChannelInstanceRegistrations m_channelInstanceRegistrations; diff --git a/sdrbase/device/devicesourceapi.cpp b/sdrbase/device/devicesourceapi.cpp index d1cfdb02e..ee7d92be4 100644 --- a/sdrbase/device/devicesourceapi.cpp +++ b/sdrbase/device/devicesourceapi.cpp @@ -14,9 +14,9 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include #include "device/devicesourceapi.h" #include "device/devicesinkapi.h" -#include "plugin/plugingui.h" #include "plugin/pluginapi.h" #include "plugin/plugininterface.h" #include "gui/glspectrum.h" @@ -161,7 +161,7 @@ void DeviceSourceAPI::setSampleSourceSequence(int sequence) m_deviceSourceEngine->setSourceSequence(sequence); } -void DeviceSourceAPI::setSampleSourcePluginGUI(PluginGUI *gui) +void DeviceSourceAPI::setSampleSourcePluginGUI(PluginInstanceUI *gui) { if (m_sampleSourcePluginGUI != 0) { @@ -172,13 +172,13 @@ void DeviceSourceAPI::setSampleSourcePluginGUI(PluginGUI *gui) m_sampleSourcePluginGUI = gui; } -void DeviceSourceAPI::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI) +void DeviceSourceAPI::registerChannelInstance(const QString& channelName, PluginInstanceUI* pluginGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, pluginGUI)); renameChannelInstances(); } -void DeviceSourceAPI::removeChannelInstance(PluginGUI* pluginGUI) +void DeviceSourceAPI::removeChannelInstance(PluginInstanceUI* pluginGUI) { for(ChannelInstanceRegistrations::iterator it = m_channelInstanceRegistrations.begin(); it != m_channelInstanceRegistrations.end(); ++it) { diff --git a/sdrbase/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h index 175a03558..20d88384c 100644 --- a/sdrbase/device/devicesourceapi.h +++ b/sdrbase/device/devicesourceapi.h @@ -34,7 +34,7 @@ class DeviceSampleSource; class MessageQueue; class ChannelMarker; class QWidget; -class PluginGUI; +class PluginInstanceUI; class PluginAPI; class Preset; class DeviceSinkAPI; @@ -70,15 +70,15 @@ public: void setSampleSourceId(const QString& id); void setSampleSourceSerial(const QString& serial); void setSampleSourceSequence(int sequence); - void setSampleSourcePluginGUI(PluginGUI *gui); + void setSampleSourcePluginGUI(PluginInstanceUI *gui); const QString& getHardwareId() const { return m_hardwareId; } const QString& getSampleSourceId() const { return m_sampleSourceId; } const QString& getSampleSourceSerial() const { return m_sampleSourceSerial; } uint32_t getSampleSourceSequence() const { return m_sampleSourceSequence; } - void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI); - void removeChannelInstance(PluginGUI* pluginGUI); + void registerChannelInstance(const QString& channelName, PluginInstanceUI* pluginGUI); + void removeChannelInstance(PluginInstanceUI* pluginGUI); void freeAll(); @@ -106,14 +106,14 @@ protected: struct ChannelInstanceRegistration { QString m_channelName; - PluginGUI* m_gui; + PluginInstanceUI* m_gui; ChannelInstanceRegistration() : m_channelName(), m_gui(NULL) { } - ChannelInstanceRegistration(const QString& channelName, PluginGUI* pluginGUI) : + ChannelInstanceRegistration(const QString& channelName, PluginInstanceUI* pluginGUI) : m_channelName(channelName), m_gui(pluginGUI) { } @@ -142,7 +142,7 @@ protected: QString m_sampleSourceId; QString m_sampleSourceSerial; uint32_t m_sampleSourceSequence; - PluginGUI* m_sampleSourcePluginGUI; + PluginInstanceUI* m_sampleSourcePluginGUI; ChannelInstanceRegistrations m_channelInstanceRegistrations; diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index 60bb855bf..295607d5e 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -15,6 +15,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include +#include #include #include #include @@ -43,10 +45,7 @@ #include "dsp/dspengine.h" #include "dsp/spectrumvis.h" #include "dsp/dspcommands.h" -#include "plugin/plugingui.h" #include "plugin/pluginapi.h" -#include "plugin/plugingui.h" - #include "gui/glspectrum.h" #include "gui/glspectrumgui.h" @@ -841,7 +840,7 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus // constructs new GUI and input object QWidget *gui; PluginManager::SamplingDevice *sampleSourceDevice = (PluginManager::SamplingDevice *) devicePtr; - PluginGUI *pluginGUI = sampleSourceDevice->m_plugin->createSampleSourcePluginGUI(sampleSourceDevice->m_deviceId, &gui, deviceUI->m_deviceSourceAPI); + PluginInstanceUI *pluginGUI = sampleSourceDevice->m_plugin->createSampleSourcePluginGUI(sampleSourceDevice->m_deviceId, &gui, deviceUI->m_deviceSourceAPI); deviceUI->m_deviceSourceAPI->setSampleSourcePluginGUI(pluginGUI); deviceUI->m_deviceSourceAPI->setInputGUI(gui, sampleSourceDevice->m_displayName); @@ -911,7 +910,7 @@ void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused // constructs new GUI and output object QWidget *gui; PluginManager::SamplingDevice *sampleSinkDevice = (PluginManager::SamplingDevice *) devicePtr; - PluginGUI *pluginGUI = sampleSinkDevice->m_plugin->createSampleSinkPluginGUI(sampleSinkDevice->m_deviceId, &gui, deviceUI->m_deviceSinkAPI); + PluginInstanceUI *pluginGUI = sampleSinkDevice->m_plugin->createSampleSinkPluginGUI(sampleSinkDevice->m_deviceId, &gui, deviceUI->m_deviceSinkAPI); deviceUI->m_deviceSinkAPI->setSampleSinkPluginGUI(pluginGUI); deviceUI->m_deviceSinkAPI->setOutputGUI(gui, sampleSinkDevice->m_displayName); diff --git a/sdrbase/mainwindow.h b/sdrbase/mainwindow.h index 70cde86ce..c575ba6dd 100644 --- a/sdrbase/mainwindow.h +++ b/sdrbase/mainwindow.h @@ -41,7 +41,7 @@ class GLSpectrum; class GLSpectrumGUI; class ChannelWindow; class PluginAPI; -class PluginGUI; +class PluginInstanceUI; class ChannelMarker; class PluginManager; class DeviceSourceAPI; diff --git a/sdrbase/plugin/pluginapi.h b/sdrbase/plugin/pluginapi.h index 85c3879c1..ebc2d91e6 100644 --- a/sdrbase/plugin/pluginapi.h +++ b/sdrbase/plugin/pluginapi.h @@ -12,7 +12,7 @@ class PluginManager; class PluginInterface; class MainWindow; class MessageQueue; -class PluginGUI; +class PluginInstanceUI; class SDRANGEL_API PluginAPI : public QObject { Q_OBJECT diff --git a/sdrbase/plugin/plugingui.h b/sdrbase/plugin/plugininstanceui.h similarity index 64% rename from sdrbase/plugin/plugingui.h rename to sdrbase/plugin/plugininstanceui.h index 654ddf616..dc54260d6 100644 --- a/sdrbase/plugin/plugingui.h +++ b/sdrbase/plugin/plugininstanceui.h @@ -1,14 +1,18 @@ -#ifndef INCLUDE_PLUGINGUI_H -#define INCLUDE_PLUGINGUI_H +#ifndef INCLUDE_PLUGININSTANCEUI_H +#define INCLUDE_PLUGININSTANCEUI_H + +#include +#include +#include #include "util/export.h" class Message; -class SDRANGEL_API PluginGUI { +class SDRANGEL_API PluginInstanceUI { public: - PluginGUI() { }; - virtual ~PluginGUI() { }; + PluginInstanceUI() { }; + virtual ~PluginInstanceUI() { }; virtual void destroy() = 0; @@ -26,4 +30,4 @@ public: virtual bool handleMessage(const Message& message) = 0; }; -#endif // INCLUDE_PLUGINGUI_H +#endif // INCLUDE_PLUGININSTANCEUI_H diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index 0cf6b3512..2f545dd7f 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -17,7 +17,7 @@ struct PluginDescriptor { class PluginAPI; class DeviceSourceAPI; class DeviceSinkAPI; -class PluginGUI; +class PluginInstanceUI; class QWidget; class PluginInterface { @@ -50,18 +50,18 @@ public: virtual void initPlugin(PluginAPI* pluginAPI) = 0; // channel Rx plugins - virtual PluginGUI* createRxChannel(const QString& channelName __attribute__((unused)), DeviceSourceAPI *deviceAPI __attribute__((unused)) ) { return 0; } + virtual PluginInstanceUI* createRxChannel(const QString& channelName __attribute__((unused)), DeviceSourceAPI *deviceAPI __attribute__((unused)) ) { return 0; } // channel Tx plugins - virtual PluginGUI* createTxChannel(const QString& channelName __attribute__((unused)), DeviceSinkAPI *deviceAPI __attribute__((unused)) ) { return 0; } + virtual PluginInstanceUI* createTxChannel(const QString& channelName __attribute__((unused)), DeviceSinkAPI *deviceAPI __attribute__((unused)) ) { return 0; } // device source plugins only virtual SamplingDevices enumSampleSources() { return SamplingDevices(); } - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId __attribute__((unused)), QWidget **widget __attribute__((unused)), DeviceSourceAPI *deviceAPI __attribute__((unused))) { return 0; } + virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId __attribute__((unused)), QWidget **widget __attribute__((unused)), DeviceSourceAPI *deviceAPI __attribute__((unused))) { return 0; } // device sink plugins only virtual SamplingDevices enumSampleSinks() { return SamplingDevices(); } - virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId __attribute__((unused)), QWidget **widget __attribute__((unused)), DeviceSinkAPI *deviceAPI __attribute__((unused))) { return 0; } + virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId __attribute__((unused)), QWidget **widget __attribute__((unused)), DeviceSinkAPI *deviceAPI __attribute__((unused))) { return 0; } }; Q_DECLARE_INTERFACE(PluginInterface, "SDRangel.PluginInterface/0.1"); diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index 9645ef3af..469d76c90 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -14,6 +14,7 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include #include "device/devicesourceapi.h" #include "device/devicesinkapi.h" #include @@ -22,7 +23,6 @@ #include #include "plugin/pluginmanager.h" -#include "plugin/plugingui.h" #include "settings/preset.h" #include "mainwindow.h" #include "gui/glspectrum.h" @@ -392,7 +392,7 @@ int PluginManager::selectSampleSourceByIndex(int index, DeviceSourceAPI *deviceA deviceAPI->setSampleSourceSerial(m_sampleSourceDevices[index].m_deviceSerial); QWidget *gui; - PluginGUI *pluginGUI = m_sampleSourceDevices[index].m_plugin->createSampleSourcePluginGUI(m_sampleSourceDevices[index].m_deviceId, &gui, deviceAPI); + PluginInstanceUI *pluginGUI = m_sampleSourceDevices[index].m_plugin->createSampleSourcePluginGUI(m_sampleSourceDevices[index].m_deviceId, &gui, deviceAPI); // m_sampleSourcePluginGUI = pluginGUI; deviceAPI->setSampleSourcePluginGUI(pluginGUI); @@ -430,7 +430,7 @@ int PluginManager::selectSampleSinkByIndex(int index, DeviceSinkAPI *deviceAPI) deviceAPI->setSampleSinkPluginGUI(0); // this effectively destroys the previous GUI if it exists QWidget *gui; - PluginGUI *pluginGUI = m_sampleSinkDevices[index].m_plugin->createSampleSinkPluginGUI(m_sampleSinkDevices[index].m_deviceId, &gui, deviceAPI); + PluginInstanceUI *pluginGUI = m_sampleSinkDevices[index].m_plugin->createSampleSinkPluginGUI(m_sampleSinkDevices[index].m_deviceId, &gui, deviceAPI); // m_sampleSourcePluginGUI = pluginGUI; deviceAPI->setSampleSinkSequence(m_sampleSinkDevices[index].m_deviceSequence); @@ -482,7 +482,7 @@ int PluginManager::selectFirstSampleSource(const QString& sourceId, DeviceSource deviceAPI->setSampleSourcePluginGUI(0); // this effectively destroys the previous GUI if it exists QWidget *gui; - PluginGUI *pluginGUI = m_sampleSourceDevices[index].m_plugin->createSampleSourcePluginGUI(m_sampleSourceDevices[index].m_deviceId, &gui, deviceAPI); + PluginInstanceUI *pluginGUI = m_sampleSourceDevices[index].m_plugin->createSampleSourcePluginGUI(m_sampleSourceDevices[index].m_deviceId, &gui, deviceAPI); // m_sampleSourcePluginGUI = pluginGUI; deviceAPI->setSampleSourceSequence(m_sampleSourceDevices[index].m_deviceSequence); @@ -534,7 +534,7 @@ int PluginManager::selectFirstSampleSink(const QString& sinkId, DeviceSinkAPI *d deviceAPI->setSampleSinkPluginGUI(0); // this effectively destroys the previous GUI if it exists QWidget *gui; - PluginGUI *pluginGUI = m_sampleSinkDevices[index].m_plugin->createSampleSinkPluginGUI(m_sampleSinkDevices[index].m_deviceId, &gui, deviceAPI); + PluginInstanceUI *pluginGUI = m_sampleSinkDevices[index].m_plugin->createSampleSinkPluginGUI(m_sampleSinkDevices[index].m_deviceId, &gui, deviceAPI); // m_sampleSourcePluginGUI = pluginGUI; deviceAPI->setSampleSinkSequence(m_sampleSinkDevices[index].m_deviceSequence); @@ -610,7 +610,7 @@ int PluginManager::selectSampleSourceBySerialOrSequence(const QString& sourceId, deviceAPI->setSampleSourcePluginGUI(0); // this effectively destroys the previous GUI if it exists QWidget *gui; - PluginGUI *pluginGUI = m_sampleSourceDevices[index].m_plugin->createSampleSourcePluginGUI(m_sampleSourceDevices[index].m_deviceId, &gui, deviceAPI); + PluginInstanceUI *pluginGUI = m_sampleSourceDevices[index].m_plugin->createSampleSourcePluginGUI(m_sampleSourceDevices[index].m_deviceId, &gui, deviceAPI); // m_sampleSourcePluginGUI = pluginGUI; deviceAPI->setSampleSourceSequence(m_sampleSourceDevices[index].m_deviceSequence); @@ -686,7 +686,7 @@ int PluginManager::selectSampleSinkBySerialOrSequence(const QString& sinkId, con deviceAPI->setSampleSinkPluginGUI(0); // this effectively destroys the previous GUI if it exists QWidget *gui; - PluginGUI *pluginGUI = m_sampleSinkDevices[index].m_plugin->createSampleSinkPluginGUI(m_sampleSinkDevices[index].m_deviceId, &gui, deviceAPI); + PluginInstanceUI *pluginGUI = m_sampleSinkDevices[index].m_plugin->createSampleSinkPluginGUI(m_sampleSinkDevices[index].m_deviceId, &gui, deviceAPI); // m_sampleSourcePluginGUI = pluginGUI; deviceAPI->setSampleSinkSequence(m_sampleSinkDevices[index].m_deviceSequence);