diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index 7c657a861..5b7215ed4 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -356,7 +356,7 @@ void ChannelAnalyzerGUI::onMenuDialogCalled(const QPoint& p) } ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::ChannelAnalyzerGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -424,7 +424,6 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device ChannelAnalyzerGUI::~ChannelAnalyzerGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_channelAnalyzer; // TODO: check this: when the GUI closes it has to delete the demodulator delete m_scopeVis; delete m_spectrumScopeComboVis; diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index e6b5d2181..5e66cfd01 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -19,7 +19,7 @@ #define INCLUDE_CHANNELANALYZERNGGUI_H #include "plugin/plugininstancegui.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "dsp/dsptypes.h" #include "util/movingaverage.h" @@ -39,7 +39,7 @@ namespace Ui { class ChannelAnalyzerGUI; } -class ChannelAnalyzerGUI : public RollupWidget, public PluginInstanceGUI { +class ChannelAnalyzerGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp index 84df3912d..134f91c00 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp @@ -68,7 +68,7 @@ void ChannelAnalyzerPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSample } } -PluginInstanceGUI* ChannelAnalyzerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* ChannelAnalyzerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return ChannelAnalyzerGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.h b/plugins/channelrx/chanalyzer/chanalyzerplugin.h index 8e571c501..7fa4cb076 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.h +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 9898a3c3b..23ae42683 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -228,7 +228,7 @@ void AMDemodGUI::onMenuDialogCalled(const QPoint &p) } AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::AMDemodGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -289,7 +289,6 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS AMDemodGUI::~AMDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_amDemod; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index f28f9d357..29050d5db 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -4,7 +4,7 @@ #include #include "plugin/plugininstancegui.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "util/messagequeue.h" @@ -20,7 +20,7 @@ namespace Ui { class AMDemodGUI; } -class AMDemodGUI : public RollupWidget, public PluginInstanceGUI { +class AMDemodGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index 8d913a26e..5b62dbe7f 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -54,14 +54,14 @@ void AMDemodPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **b } #ifdef SERVER_MODE -PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI( +ChannelGUI* AMDemodPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return AMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demodam/amdemodplugin.h b/plugins/channelrx/demodam/amdemodplugin.h index 1a960995e..3c311fbf4 100644 --- a/plugins/channelrx/demodam/amdemodplugin.h +++ b/plugins/channelrx/demodam/amdemodplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 426941c53..37e281a41 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -208,7 +208,7 @@ void ATVDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) } ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* objParent) : - RollupWidget(objParent), + ChannelGUI(objParent), ui(new Ui::ATVDemodGUI), m_pluginAPI(objPluginAPI), m_deviceUISet(deviceUISet), @@ -275,7 +275,6 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base ATVDemodGUI::~ATVDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_atvDemod; // TODO: check this: when the GUI closes it has to delete the demodulator delete m_scopeVis; delete ui; diff --git a/plugins/channelrx/demodatv/atvdemodgui.h b/plugins/channelrx/demodatv/atvdemodgui.h index 6a403c755..362616331 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.h +++ b/plugins/channelrx/demodatv/atvdemodgui.h @@ -20,7 +20,7 @@ #define INCLUDE_ATVDEMODGUI_H #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/movingaverage.h" #include "util/messagequeue.h" @@ -38,7 +38,7 @@ namespace Ui class ATVDemodGUI; } -class ATVDemodGUI : public RollupWidget, public PluginInstanceGUI +class ATVDemodGUI : public ChannelGUI { Q_OBJECT diff --git a/plugins/channelrx/demodatv/atvdemodplugin.cpp b/plugins/channelrx/demodatv/atvdemodplugin.cpp index 9b64949e8..4e6cea704 100644 --- a/plugins/channelrx/demodatv/atvdemodplugin.cpp +++ b/plugins/channelrx/demodatv/atvdemodplugin.cpp @@ -73,7 +73,7 @@ void ATVDemodPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink ** } } -PluginInstanceGUI* ATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* ATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return ATVDemodGUI::create(m_ptrPluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demodatv/atvdemodplugin.h b/plugins/channelrx/demodatv/atvdemodplugin.h index 81ab05493..a8ee2ccfb 100644 --- a/plugins/channelrx/demodatv/atvdemodplugin.h +++ b/plugins/channelrx/demodatv/atvdemodplugin.h @@ -38,7 +38,7 @@ public: void initPlugin(PluginAPI* ptrPluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index b3083999d..8ce703b39 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -342,7 +342,7 @@ void BFMDemodGUI::onMenuDialogCalled(const QPoint &p) } BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::BFMDemodGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -420,7 +420,6 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban BFMDemodGUI::~BFMDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_bfmDemod; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h index af794e610..a12a4622f 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.h +++ b/plugins/channelrx/demodbfm/bfmdemodgui.h @@ -20,7 +20,7 @@ #define INCLUDE_BFMDEMODGUI_H #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/messagequeue.h" #include "bfmdemodsettings.h" @@ -37,7 +37,7 @@ namespace Ui { class BFMDemodGUI; } -class BFMDemodGUI : public RollupWidget, public PluginInstanceGUI { +class BFMDemodGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index c96125a71..087490b4e 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -74,14 +74,14 @@ void BFMPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, C } #ifdef SERVER_MODE -PluginInstanceGUI* BFMPlugin::createRxChannelGUI( +ChannelGUI* BFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* BFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return BFMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demodbfm/bfmplugin.h b/plugins/channelrx/demodbfm/bfmplugin.h index 14a9d4551..95c1d433d 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.h +++ b/plugins/channelrx/demodbfm/bfmplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index ea326ee88..9d5e65a45 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -173,7 +173,7 @@ void DATVDemodGUI::onMenuDialogCalled(const QPoint &p) } DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* objParent) : - RollupWidget(objParent), + ChannelGUI(objParent), ui(new Ui::DATVDemodGUI), m_objPluginAPI(objPluginAPI), m_deviceUISet(deviceUISet), @@ -244,7 +244,6 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba DATVDemodGUI::~DATVDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_objDATVDemod; delete ui; } diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index 72162fcfb..f7e51d2c6 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -20,7 +20,7 @@ #ifndef INCLUDE_DATVDEMODGUI_H #define INCLUDE_DATVDEMODGUI_H -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "plugin/plugininstancegui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -39,7 +39,7 @@ namespace Ui class DATVDemodGUI; } -class DATVDemodGUI : public RollupWidget, public PluginInstanceGUI +class DATVDemodGUI : public ChannelGUI { Q_OBJECT diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.cpp b/plugins/channelrx/demoddatv/datvdemodplugin.cpp index 8ca60c245..e9bd91bc3 100644 --- a/plugins/channelrx/demoddatv/datvdemodplugin.cpp +++ b/plugins/channelrx/demoddatv/datvdemodplugin.cpp @@ -74,7 +74,7 @@ void DATVDemodPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink * } } -PluginInstanceGUI* DATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* DATVDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return DATVDemodGUI::create(m_ptrPluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.h b/plugins/channelrx/demoddatv/datvdemodplugin.h index 5a3383ba8..922c5bae7 100644 --- a/plugins/channelrx/demoddatv/datvdemodplugin.h +++ b/plugins/channelrx/demoddatv/datvdemodplugin.h @@ -39,7 +39,7 @@ public: void initPlugin(PluginAPI* ptrPluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index eec1bfe01..f9f453c13 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -301,7 +301,7 @@ void DSDDemodGUI::on_viewStatusLog_clicked() } DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::DSDDemodGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -381,7 +381,6 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban DSDDemodGUI::~DSDDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_dsdDemod; // TODO: check this: when the GUI closes it has to delete the demodulator delete m_scopeVisXY; delete ui; diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h index f7230115e..34395d29e 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.h +++ b/plugins/channelrx/demoddsd/dsddemodgui.h @@ -22,7 +22,7 @@ #include #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/dsptypes.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -42,7 +42,7 @@ namespace Ui { class DSDDemodGUI; } -class DSDDemodGUI : public RollupWidget, public PluginInstanceGUI { +class DSDDemodGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index 045212b45..7fc6131ba 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -73,14 +73,14 @@ void DSDDemodPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink ** } #ifdef SERVER_MODE -PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI( +ChannelGUI* DSDDemodPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* DSDDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return DSDDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.h b/plugins/channelrx/demoddsd/dsddemodplugin.h index 9e728c695..3f402a5e6 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.h +++ b/plugins/channelrx/demoddsd/dsddemodplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp index 4dd0cc272..fe4056113 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp @@ -236,7 +236,7 @@ void FreeDVDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) } FreeDVDemodGUI::FreeDVDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::FreeDVDemodGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -308,7 +308,6 @@ FreeDVDemodGUI::FreeDVDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B FreeDVDemodGUI::~FreeDVDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_freeDVDemod; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.h b/plugins/channelrx/demodfreedv/freedvdemodgui.h index d6618bf4a..8f2d2e1b9 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.h +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.h @@ -21,7 +21,7 @@ #include #include "plugin/plugininstancegui.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "util/messagequeue.h" @@ -39,7 +39,7 @@ namespace Ui { class FreeDVDemodGUI; } -class FreeDVDemodGUI : public RollupWidget, public PluginInstanceGUI { +class FreeDVDemodGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodfreedv/freedvplugin.cpp b/plugins/channelrx/demodfreedv/freedvplugin.cpp index 998cdb7bc..d0eae9931 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.cpp +++ b/plugins/channelrx/demodfreedv/freedvplugin.cpp @@ -71,14 +71,14 @@ void FreeDVPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs } #ifdef SERVER_MODE -PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI( +ChannelGUI* FreeDVPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* FreeDVPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return FreeDVDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demodfreedv/freedvplugin.h b/plugins/channelrx/demodfreedv/freedvplugin.h index cf650c176..213a2983e 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.h +++ b/plugins/channelrx/demodfreedv/freedvplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demodlora/lorademodgui.cpp b/plugins/channelrx/demodlora/lorademodgui.cpp index 5f31f0f34..94824fb8c 100644 --- a/plugins/channelrx/demodlora/lorademodgui.cpp +++ b/plugins/channelrx/demodlora/lorademodgui.cpp @@ -108,7 +108,7 @@ void LoRaDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) } LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::LoRaDemodGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), diff --git a/plugins/channelrx/demodlora/lorademodgui.h b/plugins/channelrx/demodlora/lorademodgui.h index f86751d93..64397a863 100644 --- a/plugins/channelrx/demodlora/lorademodgui.h +++ b/plugins/channelrx/demodlora/lorademodgui.h @@ -2,7 +2,7 @@ #define INCLUDE_LoRaDEMODGUI_H #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/messagequeue.h" @@ -18,7 +18,7 @@ namespace Ui { class LoRaDemodGUI; } -class LoRaDemodGUI : public RollupWidget, public PluginInstanceGUI { +class LoRaDemodGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodlora/loraplugin.cpp b/plugins/channelrx/demodlora/loraplugin.cpp index 9ad2c3652..d5fbf301f 100644 --- a/plugins/channelrx/demodlora/loraplugin.cpp +++ b/plugins/channelrx/demodlora/loraplugin.cpp @@ -50,7 +50,7 @@ void LoRaPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, } } -PluginInstanceGUI* LoRaPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* LoRaPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return LoRaDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demodlora/loraplugin.h b/plugins/channelrx/demodlora/loraplugin.h index 90f408fe5..85fbcfce4 100644 --- a/plugins/channelrx/demodlora/loraplugin.h +++ b/plugins/channelrx/demodlora/loraplugin.h @@ -19,7 +19,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index e1752bd8a..a8a092488 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -254,7 +254,7 @@ void NFMDemodGUI::onMenuDialogCalled(const QPoint &p) } NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::NFMDemodGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -333,7 +333,6 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban NFMDemodGUI::~NFMDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_nfmDemod; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index 108f18f9c..0cc143733 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -2,7 +2,7 @@ #define INCLUDE_NFMDEMODGUI_H #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/dsptypes.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" @@ -19,7 +19,7 @@ namespace Ui { class NFMDemodGUI; } -class NFMDemodGUI : public RollupWidget, public PluginInstanceGUI { +class NFMDemodGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index 00ebec700..f28303490 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -55,14 +55,14 @@ void NFMPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, C } #ifdef SERVER_MODE -PluginInstanceGUI* NFMPlugin::createRxChannelGUI( +ChannelGUI* NFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* NFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return NFMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demodnfm/nfmplugin.h b/plugins/channelrx/demodnfm/nfmplugin.h index ddea843e9..8de8615e3 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.h +++ b/plugins/channelrx/demodnfm/nfmplugin.h @@ -19,7 +19,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index 3348af0bc..b57ce63b8 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -268,7 +268,7 @@ void SSBDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) } SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::SSBDemodGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -342,7 +342,6 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban SSBDemodGUI::~SSBDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_ssbDemod; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index bb09e1d29..e2f6d32e2 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -4,7 +4,7 @@ #include #include "plugin/plugininstancegui.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "util/messagequeue.h" @@ -22,7 +22,7 @@ namespace Ui { class SSBDemodGUI; } -class SSBDemodGUI : public RollupWidget, public PluginInstanceGUI { +class SSBDemodGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index caaf07c27..db08a9efd 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -55,14 +55,14 @@ void SSBPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, C } #ifdef SERVER_MODE -PluginInstanceGUI* SSBPlugin::createRxChannelGUI( +ChannelGUI* SSBPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* SSBPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return SSBDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demodssb/ssbplugin.h b/plugins/channelrx/demodssb/ssbplugin.h index df2b0b18d..40d17c2b4 100644 --- a/plugins/channelrx/demodssb/ssbplugin.h +++ b/plugins/channelrx/demodssb/ssbplugin.h @@ -19,7 +19,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index 2f4dd17c2..7bf845536 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -192,7 +192,7 @@ void WFMDemodGUI::onMenuDialogCalled(const QPoint &p) } WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::WFMDemodGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -246,7 +246,6 @@ WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban WFMDemodGUI::~WFMDemodGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_wfmDemod; // TODO: check this: when the GUI closes it has to delete the demodulator //delete m_channelMarker; delete ui; diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index 030d0f507..1da0d8b61 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -2,7 +2,7 @@ #define INCLUDE_WFMDEMODGUI_H #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/messagequeue.h" @@ -17,7 +17,7 @@ namespace Ui { class WFMDemodGUI; } -class WFMDemodGUI : public RollupWidget, public PluginInstanceGUI { +class WFMDemodGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index 3d13e5c6e..8b2cba49f 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -56,14 +56,14 @@ void WFMPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, C } #ifdef SERVER_MODE -PluginInstanceGUI* WFMPlugin::createRxChannelGUI( +ChannelGUI* WFMPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* WFMPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return WFMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/demodwfm/wfmplugin.h b/plugins/channelrx/demodwfm/wfmplugin.h index d69134e8b..c8804ae3b 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.h +++ b/plugins/channelrx/demodwfm/wfmplugin.h @@ -19,7 +19,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/filesink/filesinkgui.cpp b/plugins/channelrx/filesink/filesinkgui.cpp index b2f86a3a4..84941196f 100644 --- a/plugins/channelrx/filesink/filesinkgui.cpp +++ b/plugins/channelrx/filesink/filesinkgui.cpp @@ -148,7 +148,7 @@ bool FileSinkGUI::handleMessage(const Message& message) } FileSinkGUI::FileSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *channelrx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::FileSinkGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -198,7 +198,6 @@ FileSinkGUI::FileSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban FileSinkGUI::~FileSinkGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_fileSink; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/filesink/filesinkgui.h b/plugins/channelrx/filesink/filesinkgui.h index 084d8b1e5..c77a59592 100644 --- a/plugins/channelrx/filesink/filesinkgui.h +++ b/plugins/channelrx/filesink/filesinkgui.h @@ -24,7 +24,7 @@ #include "plugin/plugininstancegui.h" #include "dsp/channelmarker.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "util/messagequeue.h" #include "filesinksettings.h" @@ -39,7 +39,7 @@ namespace Ui { class FileSinkGUI; } -class FileSinkGUI : public RollupWidget, public PluginInstanceGUI { +class FileSinkGUI : public ChannelGUI { Q_OBJECT public: static FileSinkGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); diff --git a/plugins/channelrx/filesink/filesinkplugin.cpp b/plugins/channelrx/filesink/filesinkplugin.cpp index 9a2ce9c9c..75f656db4 100644 --- a/plugins/channelrx/filesink/filesinkplugin.cpp +++ b/plugins/channelrx/filesink/filesinkplugin.cpp @@ -72,14 +72,14 @@ void FileSinkPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink ** } #ifdef SERVER_MODE -PluginInstanceGUI* FileSinkPlugin::createRxChannelGUI( +ChannelGUI* FileSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return nullptr; } #else -PluginInstanceGUI* FileSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* FileSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return FileSinkGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/filesink/filesinkplugin.h b/plugins/channelrx/filesink/filesinkplugin.h index 00f233e9d..bbe2a0f54 100644 --- a/plugins/channelrx/filesink/filesinkplugin.h +++ b/plugins/channelrx/filesink/filesinkplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/freqtracker/freqtrackergui.cpp b/plugins/channelrx/freqtracker/freqtrackergui.cpp index 37b7190e1..90a2a6782 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.cpp +++ b/plugins/channelrx/freqtracker/freqtrackergui.cpp @@ -283,7 +283,7 @@ void FreqTrackerGUI::onMenuDialogCalled(const QPoint &p) } FreqTrackerGUI::FreqTrackerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::FreqTrackerGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -332,7 +332,6 @@ FreqTrackerGUI::FreqTrackerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B FreqTrackerGUI::~FreqTrackerGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_freqTracker; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/freqtracker/freqtrackergui.h b/plugins/channelrx/freqtracker/freqtrackergui.h index 9c442ad15..de6100782 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.h +++ b/plugins/channelrx/freqtracker/freqtrackergui.h @@ -21,7 +21,7 @@ #include #include "plugin/plugininstancegui.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "util/messagequeue.h" @@ -37,7 +37,7 @@ namespace Ui { class FreqTrackerGUI; } -class FreqTrackerGUI : public RollupWidget, public PluginInstanceGUI { +class FreqTrackerGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp index d3cf2a9cd..d60b13e47 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp @@ -71,14 +71,14 @@ void FreqTrackerPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink } #ifdef SERVER_MODE -PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI( +ChannelGUI* FreqTrackerPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* FreqTrackerPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return FreqTrackerGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.h b/plugins/channelrx/freqtracker/freqtrackerplugin.h index 5b1b2d4c7..ceb3666a2 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.h +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/localsink/localsinkgui.cpp b/plugins/channelrx/localsink/localsinkgui.cpp index 3d8f96c49..5820e3fba 100644 --- a/plugins/channelrx/localsink/localsinkgui.cpp +++ b/plugins/channelrx/localsink/localsinkgui.cpp @@ -93,7 +93,7 @@ bool LocalSinkGUI::handleMessage(const Message& message) } LocalSinkGUI::LocalSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *channelrx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::LocalSinkGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -130,7 +130,6 @@ LocalSinkGUI::LocalSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb LocalSinkGUI::~LocalSinkGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_localSink; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/localsink/localsinkgui.h b/plugins/channelrx/localsink/localsinkgui.h index 7e1e3f9ca..c9e32c4ee 100644 --- a/plugins/channelrx/localsink/localsinkgui.h +++ b/plugins/channelrx/localsink/localsinkgui.h @@ -24,7 +24,7 @@ #include "plugin/plugininstancegui.h" #include "dsp/channelmarker.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "util/messagequeue.h" #include "localsinksettings.h" @@ -38,7 +38,7 @@ namespace Ui { class LocalSinkGUI; } -class LocalSinkGUI : public RollupWidget, public PluginInstanceGUI { +class LocalSinkGUI : public ChannelGUI { Q_OBJECT public: static LocalSinkGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); diff --git a/plugins/channelrx/localsink/localsinkplugin.cpp b/plugins/channelrx/localsink/localsinkplugin.cpp index cc21a5c6d..db8642c78 100644 --- a/plugins/channelrx/localsink/localsinkplugin.cpp +++ b/plugins/channelrx/localsink/localsinkplugin.cpp @@ -73,14 +73,14 @@ void LocalSinkPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink * } #ifdef SERVER_MODE -PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI( +ChannelGUI* LocalSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* LocalSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return LocalSinkGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/localsink/localsinkplugin.h b/plugins/channelrx/localsink/localsinkplugin.h index 17c1e740a..0c38fe1e9 100644 --- a/plugins/channelrx/localsink/localsinkplugin.h +++ b/plugins/channelrx/localsink/localsinkplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/remotesink/remotesinkgui.cpp b/plugins/channelrx/remotesink/remotesinkgui.cpp index 76c96ca35..7665a379a 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.cpp +++ b/plugins/channelrx/remotesink/remotesinkgui.cpp @@ -92,7 +92,7 @@ bool RemoteSinkGUI::handleMessage(const Message& message) } RemoteSinkGUI::RemoteSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *channelrx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::RemoteSinkGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -129,7 +129,6 @@ RemoteSinkGUI::RemoteSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas RemoteSinkGUI::~RemoteSinkGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_remoteSink; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/remotesink/remotesinkgui.h b/plugins/channelrx/remotesink/remotesinkgui.h index 894f67d59..7eb29204a 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.h +++ b/plugins/channelrx/remotesink/remotesinkgui.h @@ -24,7 +24,7 @@ #include "plugin/plugininstancegui.h" #include "dsp/channelmarker.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "util/messagequeue.h" #include "remotesinksettings.h" @@ -38,7 +38,7 @@ namespace Ui { class RemoteSinkGUI; } -class RemoteSinkGUI : public RollupWidget, public PluginInstanceGUI { +class RemoteSinkGUI : public ChannelGUI { Q_OBJECT public: static RemoteSinkGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); diff --git a/plugins/channelrx/remotesink/remotesinkplugin.cpp b/plugins/channelrx/remotesink/remotesinkplugin.cpp index 99d5eb6a3..2f2b1cd98 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.cpp +++ b/plugins/channelrx/remotesink/remotesinkplugin.cpp @@ -73,14 +73,14 @@ void RemoteSinkPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink } #ifdef SERVER_MODE -PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI( +ChannelGUI* RemoteSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* RemoteSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return RemoteSinkGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/remotesink/remotesinkplugin.h b/plugins/channelrx/remotesink/remotesinkplugin.h index 0ffc92b93..fd3c366d6 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.h +++ b/plugins/channelrx/remotesink/remotesinkplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp index 8ae5ba4f6..237361dd4 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.cpp +++ b/plugins/channelrx/udpsink/udpsinkgui.cpp @@ -133,7 +133,7 @@ void UDPSinkGUI::tick() } UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::UDPSinkGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -209,7 +209,6 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS UDPSinkGUI::~UDPSinkGUI() { - m_deviceUISet->removeRxChannelInstance(this); delete m_udpSink; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channelrx/udpsink/udpsinkgui.h b/plugins/channelrx/udpsink/udpsinkgui.h index 63b0b464b..023cf552b 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.h +++ b/plugins/channelrx/udpsink/udpsinkgui.h @@ -21,7 +21,7 @@ #include #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "util/messagequeue.h" @@ -38,7 +38,7 @@ namespace Ui { class UDPSinkGUI; } -class UDPSinkGUI : public RollupWidget, public PluginInstanceGUI { +class UDPSinkGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channelrx/udpsink/udpsinkplugin.cpp b/plugins/channelrx/udpsink/udpsinkplugin.cpp index 0afc1f812..d0a58e831 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.cpp +++ b/plugins/channelrx/udpsink/udpsinkplugin.cpp @@ -72,14 +72,14 @@ void UDPSinkPlugin::createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **b } #ifdef SERVER_MODE -PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI( +ChannelGUI* UDPSinkPlugin::createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return 0; } #else -PluginInstanceGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const +ChannelGUI* UDPSinkPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { return UDPSinkGUI::create(m_pluginAPI, deviceUISet, rxChannel); } diff --git a/plugins/channelrx/udpsink/udpsinkplugin.h b/plugins/channelrx/udpsink/udpsinkplugin.h index df19c7f20..a08c33678 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.h +++ b/plugins/channelrx/udpsink/udpsinkplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createRxChannel(DeviceAPI *deviceAPI, BasebandSampleSink **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; + virtual ChannelGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/filesource/filesourcegui.cpp b/plugins/channeltx/filesource/filesourcegui.cpp index aadebc252..198881572 100644 --- a/plugins/channeltx/filesource/filesourcegui.cpp +++ b/plugins/channeltx/filesource/filesourcegui.cpp @@ -161,7 +161,7 @@ bool FileSourceGUI::handleMessage(const Message& message) } FileSourceGUI::FileSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::FileSourceGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -216,7 +216,6 @@ FileSourceGUI::FileSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Bas FileSourceGUI::~FileSourceGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_fileSource; delete ui; } diff --git a/plugins/channeltx/filesource/filesourcegui.h b/plugins/channeltx/filesource/filesourcegui.h index d9b081b7d..36a8858dd 100644 --- a/plugins/channeltx/filesource/filesourcegui.h +++ b/plugins/channeltx/filesource/filesourcegui.h @@ -20,7 +20,7 @@ #include "plugin/plugininstancegui.h" #include "dsp/channelmarker.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "util/messagequeue.h" #include "filesourcesettings.h" @@ -34,7 +34,7 @@ namespace Ui { class FileSourceGUI; } -class FileSourceGUI : public RollupWidget, public PluginInstanceGUI { +class FileSourceGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/filesource/filesourceplugin.cpp b/plugins/channeltx/filesource/filesourceplugin.cpp index 9d95fb2f3..36aba4c28 100644 --- a/plugins/channeltx/filesource/filesourceplugin.cpp +++ b/plugins/channeltx/filesource/filesourceplugin.cpp @@ -71,14 +71,14 @@ void FileSourcePlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSourc } #ifdef SERVER_MODE -PluginInstanceGUI* FileSourcePlugin::createTxChannelGUI( +ChannelGUI* FileSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* FileSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* FileSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return FileSourceGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/filesource/filesourceplugin.h b/plugins/channeltx/filesource/filesourceplugin.h index ddd487944..731c950ad 100644 --- a/plugins/channeltx/filesource/filesourceplugin.h +++ b/plugins/channeltx/filesource/filesourceplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/localsource/localsourcegui.cpp b/plugins/channeltx/localsource/localsourcegui.cpp index 4bfb23b01..5d7c60d30 100644 --- a/plugins/channeltx/localsource/localsourcegui.cpp +++ b/plugins/channeltx/localsource/localsourcegui.cpp @@ -87,7 +87,7 @@ bool LocalSourceGUI::handleMessage(const Message& message) } LocalSourceGUI::LocalSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channeltx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::LocalSourceGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -125,7 +125,6 @@ LocalSourceGUI::LocalSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B LocalSourceGUI::~LocalSourceGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_localSource; // TODO: check this: when the GUI closes it has to delete the demodulator delete ui; } diff --git a/plugins/channeltx/localsource/localsourcegui.h b/plugins/channeltx/localsource/localsourcegui.h index 7b3c6f6eb..0b5fccd35 100644 --- a/plugins/channeltx/localsource/localsourcegui.h +++ b/plugins/channeltx/localsource/localsourcegui.h @@ -24,7 +24,7 @@ #include "plugin/plugininstancegui.h" #include "dsp/channelmarker.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "util/messagequeue.h" #include "localsourcesettings.h" @@ -38,7 +38,7 @@ namespace Ui { class LocalSourceGUI; } -class LocalSourceGUI : public RollupWidget, public PluginInstanceGUI { +class LocalSourceGUI : public ChannelGUI { Q_OBJECT public: static LocalSourceGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel); diff --git a/plugins/channeltx/localsource/localsourceplugin.cpp b/plugins/channeltx/localsource/localsourceplugin.cpp index 70e00a1e9..c1c94b9a6 100644 --- a/plugins/channeltx/localsource/localsourceplugin.cpp +++ b/plugins/channeltx/localsource/localsourceplugin.cpp @@ -73,14 +73,14 @@ void LocalSourcePlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSour } #ifdef SERVER_MODE -PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI( +ChannelGUI* LocalSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* LocalSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* LocalSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return LocalSourceGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/localsource/localsourceplugin.h b/plugins/channeltx/localsource/localsourceplugin.h index 6e44dfd66..62336c887 100644 --- a/plugins/channeltx/localsource/localsourceplugin.h +++ b/plugins/channeltx/localsource/localsourceplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp index 979a51b90..0fafc6090 100644 --- a/plugins/channeltx/modam/ammodgui.cpp +++ b/plugins/channeltx/modam/ammodgui.cpp @@ -317,7 +317,7 @@ void AMModGUI::onMenuDialogCalled(const QPoint &p) } AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::AMModGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -385,7 +385,6 @@ AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampl AMModGUI::~AMModGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_amMod; // TODO: check this: when the GUI closes it has to delete the modulator delete ui; } diff --git a/plugins/channeltx/modam/ammodgui.h b/plugins/channeltx/modam/ammodgui.h index 1e510fd16..ff1995ae9 100644 --- a/plugins/channeltx/modam/ammodgui.h +++ b/plugins/channeltx/modam/ammodgui.h @@ -18,8 +18,7 @@ #ifndef PLUGINS_CHANNELTX_MODAM_AMMODGUI_H_ #define PLUGINS_CHANNELTX_MODAM_AMMODGUI_H_ -#include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/movingaverage.h" #include "util/messagequeue.h" @@ -37,7 +36,7 @@ namespace Ui { class AMModGUI; } -class AMModGUI : public RollupWidget, public PluginInstanceGUI { +class AMModGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index 5b0f8a0d0..a590df201 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -71,14 +71,14 @@ void AMModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **b } #ifdef SERVER_MODE -PluginInstanceGUI* AMModPlugin::createTxChannelGUI( +ChannelGUI* AMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* AMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return AMModGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/modam/ammodplugin.h b/plugins/channeltx/modam/ammodplugin.h index e992d1d3d..bf8142aac 100644 --- a/plugins/channeltx/modam/ammodplugin.h +++ b/plugins/channeltx/modam/ammodplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index 7a172041a..cf7a26f8e 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -49,7 +49,7 @@ void ATVModGUI::destroy() } ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::ATVModGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -116,7 +116,6 @@ ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam ATVModGUI::~ATVModGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_atvMod; // TODO: check this: when the GUI closes it has to delete the modulator delete ui; } diff --git a/plugins/channeltx/modatv/atvmodgui.h b/plugins/channeltx/modatv/atvmodgui.h index 88ce33e2e..c6f63016e 100644 --- a/plugins/channeltx/modatv/atvmodgui.h +++ b/plugins/channeltx/modatv/atvmodgui.h @@ -19,7 +19,7 @@ #define PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_ #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/movingaverage.h" #include "util/messagequeue.h" @@ -36,7 +36,7 @@ namespace Ui { class ATVModGUI; } -class ATVModGUI : public RollupWidget, public PluginInstanceGUI { +class ATVModGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index 419a481c7..285ecce24 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -71,14 +71,14 @@ void ATVModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource ** } #ifdef SERVER_MODE -PluginInstanceGUI* ATVModPlugin::createTxChannelGUI( +ChannelGUI* ATVModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return ATVModGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/modatv/atvmodplugin.h b/plugins/channeltx/modatv/atvmodplugin.h index e8beaef0d..043ea0c61 100644 --- a/plugins/channeltx/modatv/atvmodplugin.h +++ b/plugins/channeltx/modatv/atvmodplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/modfreedv/freedvmodgui.cpp b/plugins/channeltx/modfreedv/freedvmodgui.cpp index f34a30f96..550898121 100644 --- a/plugins/channeltx/modfreedv/freedvmodgui.cpp +++ b/plugins/channeltx/modfreedv/freedvmodgui.cpp @@ -330,7 +330,7 @@ void FreeDVModGUI::onMenuDialogCalled(const QPoint &p) } FreeDVModGUI::FreeDVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::FreeDVModGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -396,7 +396,6 @@ FreeDVModGUI::FreeDVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb FreeDVModGUI::~FreeDVModGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_freeDVMod; // TODO: check this: when the GUI closes it has to delete the modulator delete ui; } diff --git a/plugins/channeltx/modfreedv/freedvmodgui.h b/plugins/channeltx/modfreedv/freedvmodgui.h index aca38400b..986fc7cff 100644 --- a/plugins/channeltx/modfreedv/freedvmodgui.h +++ b/plugins/channeltx/modfreedv/freedvmodgui.h @@ -21,7 +21,7 @@ #include #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/movingaverage.h" #include "util/messagequeue.h" @@ -38,7 +38,7 @@ namespace Ui { class FreeDVModGUI; } -class FreeDVModGUI : public RollupWidget, public PluginInstanceGUI { +class FreeDVModGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.cpp b/plugins/channeltx/modfreedv/freedvmodplugin.cpp index 80eda4c99..c4b1b64f8 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.cpp +++ b/plugins/channeltx/modfreedv/freedvmodplugin.cpp @@ -71,14 +71,14 @@ void FreeDVModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource } #ifdef SERVER_MODE -PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI( +ChannelGUI* FreeDVModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* FreeDVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return FreeDVModGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.h b/plugins/channeltx/modfreedv/freedvmodplugin.h index 1c11f8497..7af5e9c00 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.h +++ b/plugins/channeltx/modfreedv/freedvmodplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp index d4d186415..bcff10fd0 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.cpp +++ b/plugins/channeltx/modnfm/nfmmodgui.cpp @@ -335,7 +335,7 @@ void NFMModGUI::onMenuDialogCalled(const QPoint &p) } NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::NFMModGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -418,7 +418,6 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam NFMModGUI::~NFMModGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_nfmMod; // TODO: check this: when the GUI closes it has to delete the modulator delete ui; } diff --git a/plugins/channeltx/modnfm/nfmmodgui.h b/plugins/channeltx/modnfm/nfmmodgui.h index d811484cf..0984cdc0e 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.h +++ b/plugins/channeltx/modnfm/nfmmodgui.h @@ -19,7 +19,7 @@ #define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_ #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/movingaverage.h" #include "util/messagequeue.h" @@ -35,7 +35,7 @@ namespace Ui { class NFMModGUI; } -class NFMModGUI : public RollupWidget, public PluginInstanceGUI { +class NFMModGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index c584893dc..eebd105c8 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -71,14 +71,14 @@ void NFMModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource ** } #ifdef SERVER_MODE -PluginInstanceGUI* NFMModPlugin::createTxChannelGUI( +ChannelGUI* NFMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* NFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return NFMModGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/modnfm/nfmmodplugin.h b/plugins/channeltx/modnfm/nfmmodplugin.h index fa660a583..98afc124e 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.h +++ b/plugins/channeltx/modnfm/nfmmodplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/modpacket/packetmodgui.cpp b/plugins/channeltx/modpacket/packetmodgui.cpp index 62f6b9fb2..9f0100b2b 100644 --- a/plugins/channeltx/modpacket/packetmodgui.cpp +++ b/plugins/channeltx/modpacket/packetmodgui.cpp @@ -390,7 +390,7 @@ void PacketModGUI::onMenuDialogCalled(const QPoint &p) } PacketModGUI::PacketModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::PacketModGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -465,7 +465,6 @@ PacketModGUI::PacketModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb PacketModGUI::~PacketModGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_packetMod; // TODO: check this: when the GUI closes it has to delete the modulator delete ui; } diff --git a/plugins/channeltx/modpacket/packetmodgui.h b/plugins/channeltx/modpacket/packetmodgui.h index dad3802c5..a7f1fa199 100644 --- a/plugins/channeltx/modpacket/packetmodgui.h +++ b/plugins/channeltx/modpacket/packetmodgui.h @@ -20,7 +20,7 @@ #define PLUGINS_CHANNELTX_MODPACKET_PACKETMODGUI_H_ #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/movingaverage.h" #include "util/messagequeue.h" @@ -37,7 +37,7 @@ namespace Ui { class PacketModGUI; } -class PacketModGUI : public RollupWidget, public PluginInstanceGUI { +class PacketModGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/modpacket/packetmodplugin.cpp b/plugins/channeltx/modpacket/packetmodplugin.cpp index 32c0ccf48..a0af748ed 100644 --- a/plugins/channeltx/modpacket/packetmodplugin.cpp +++ b/plugins/channeltx/modpacket/packetmodplugin.cpp @@ -71,14 +71,14 @@ void PacketModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource } #ifdef SERVER_MODE -PluginInstanceGUI* PacketModPlugin::createTxChannelGUI( +ChannelGUI* PacketModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* PacketModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* PacketModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return PacketModGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/modpacket/packetmodplugin.h b/plugins/channeltx/modpacket/packetmodplugin.h index a6474342a..c3bd071cb 100644 --- a/plugins/channeltx/modpacket/packetmodplugin.h +++ b/plugins/channeltx/modpacket/packetmodplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp index 542a99197..e7004e4b1 100644 --- a/plugins/channeltx/modssb/ssbmodgui.cpp +++ b/plugins/channeltx/modssb/ssbmodgui.cpp @@ -380,7 +380,7 @@ void SSBModGUI::onMenuDialogCalled(const QPoint &p) } SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::SSBModGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -464,7 +464,6 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam SSBModGUI::~SSBModGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_ssbMod; // TODO: check this: when the GUI closes it has to delete the modulator delete ui; } diff --git a/plugins/channeltx/modssb/ssbmodgui.h b/plugins/channeltx/modssb/ssbmodgui.h index 87edf0073..c612558d2 100644 --- a/plugins/channeltx/modssb/ssbmodgui.h +++ b/plugins/channeltx/modssb/ssbmodgui.h @@ -21,7 +21,7 @@ #include #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/movingaverage.h" #include "util/messagequeue.h" @@ -38,7 +38,7 @@ namespace Ui { class SSBModGUI; } -class SSBModGUI : public RollupWidget, public PluginInstanceGUI { +class SSBModGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index c3773264d..914825fdd 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -71,14 +71,14 @@ void SSBModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource ** } #ifdef SERVER_MODE -PluginInstanceGUI* SSBModPlugin::createTxChannelGUI( +ChannelGUI* SSBModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return SSBModGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/modssb/ssbmodplugin.h b/plugins/channeltx/modssb/ssbmodplugin.h index 67b634d8a..48a1f2f12 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.h +++ b/plugins/channeltx/modssb/ssbmodplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp index fb5ef3b03..92f7a88e3 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.cpp +++ b/plugins/channeltx/modwfm/wfmmodgui.cpp @@ -324,7 +324,7 @@ void WFMModGUI::onMenuDialogCalled(const QPoint &p) } WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::WFMModGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -402,7 +402,6 @@ WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam WFMModGUI::~WFMModGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_wfmMod; // TODO: check this: when the GUI closes it has to delete the modulator delete ui; } diff --git a/plugins/channeltx/modwfm/wfmmodgui.h b/plugins/channeltx/modwfm/wfmmodgui.h index 558372af8..7d5294b19 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.h +++ b/plugins/channeltx/modwfm/wfmmodgui.h @@ -19,7 +19,7 @@ #define PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_ #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/movingaverage.h" #include "util/messagequeue.h" @@ -35,7 +35,7 @@ namespace Ui { class WFMModGUI; } -class WFMModGUI : public RollupWidget, public PluginInstanceGUI { +class WFMModGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index 719db944b..7483bc4ac 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -71,14 +71,14 @@ void WFMModPlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource ** } #ifdef SERVER_MODE -PluginInstanceGUI* WFMModPlugin::createTxChannelGUI( +ChannelGUI* WFMModPlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* WFMModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return WFMModGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/modwfm/wfmmodplugin.h b/plugins/channeltx/modwfm/wfmmodplugin.h index ef121ed1f..e2cd07a2b 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.h +++ b/plugins/channeltx/modwfm/wfmmodplugin.h @@ -35,7 +35,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/remotesource/remotesourcegui.cpp b/plugins/channeltx/remotesource/remotesourcegui.cpp index 11560699d..4f40b5780 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.cpp +++ b/plugins/channeltx/remotesource/remotesourcegui.cpp @@ -141,7 +141,7 @@ bool RemoteSourceGUI::handleMessage(const Message& message) } RemoteSourceGUI::RemoteSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::RemoteSourceGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -190,7 +190,6 @@ RemoteSourceGUI::RemoteSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, RemoteSourceGUI::~RemoteSourceGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_remoteSrc; delete ui; } diff --git a/plugins/channeltx/remotesource/remotesourcegui.h b/plugins/channeltx/remotesource/remotesourcegui.h index 5568b3e2b..41c4c81df 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.h +++ b/plugins/channeltx/remotesource/remotesourcegui.h @@ -22,7 +22,7 @@ #include "plugin/plugininstancegui.h" #include "dsp/channelmarker.h" -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "util/messagequeue.h" #include "../remotesource/remotesourcesettings.h" @@ -36,7 +36,7 @@ namespace Ui { class RemoteSourceGUI; } -class RemoteSourceGUI : public RollupWidget, public PluginInstanceGUI { +class RemoteSourceGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/remotesource/remotesourceplugin.cpp b/plugins/channeltx/remotesource/remotesourceplugin.cpp index 52b6c7a48..4b797101c 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.cpp +++ b/plugins/channeltx/remotesource/remotesourceplugin.cpp @@ -71,14 +71,14 @@ void RemoteSourcePlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSou } #ifdef SERVER_MODE -PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI( +ChannelGUI* RemoteSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* RemoteSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return RemoteSourceGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/remotesource/remotesourceplugin.h b/plugins/channeltx/remotesource/remotesourceplugin.h index fc7786d0d..df40512bc 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.h +++ b/plugins/channeltx/remotesource/remotesourceplugin.h @@ -36,7 +36,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/plugins/channeltx/udpsource/udpsourcegui.cpp b/plugins/channeltx/udpsource/udpsourcegui.cpp index aaee4942e..a9684ca03 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.cpp +++ b/plugins/channeltx/udpsource/udpsourcegui.cpp @@ -96,7 +96,7 @@ void UDPSourceGUI::handleSourceMessages() } UDPSourceGUI::UDPSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) : - RollupWidget(parent), + ChannelGUI(parent), ui(new Ui::UDPSourceGUI), m_pluginAPI(pluginAPI), m_deviceUISet(deviceUISet), @@ -163,7 +163,6 @@ UDPSourceGUI::UDPSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb UDPSourceGUI::~UDPSourceGUI() { - m_deviceUISet->removeTxChannelInstance(this); delete m_udpSource; // TODO: check this: when the GUI closes it has to delete the modulator delete ui; } diff --git a/plugins/channeltx/udpsource/udpsourcegui.h b/plugins/channeltx/udpsource/udpsourcegui.h index 137ced66b..2f4a3f069 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.h +++ b/plugins/channeltx/udpsource/udpsourcegui.h @@ -21,7 +21,7 @@ #include #include -#include "gui/rollupwidget.h" +#include "channel/channelgui.h" #include "dsp/channelmarker.h" #include "util/messagequeue.h" #include "util/movingaverage.h" @@ -38,7 +38,7 @@ namespace Ui { class UDPSourceGUI; } -class UDPSourceGUI : public RollupWidget, public PluginInstanceGUI { +class UDPSourceGUI : public ChannelGUI { Q_OBJECT public: diff --git a/plugins/channeltx/udpsource/udpsourceplugin.cpp b/plugins/channeltx/udpsource/udpsourceplugin.cpp index fdc3cea5b..46e9ddebd 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.cpp +++ b/plugins/channeltx/udpsource/udpsourceplugin.cpp @@ -74,14 +74,14 @@ void UDPSourcePlugin::createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource } #ifdef SERVER_MODE -PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI( +ChannelGUI* UDPSourcePlugin::createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return 0; } #else -PluginInstanceGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const +ChannelGUI* UDPSourcePlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { return UDPSourceGUI::create(m_pluginAPI, deviceUISet, txChannel); } diff --git a/plugins/channeltx/udpsource/udpsourceplugin.h b/plugins/channeltx/udpsource/udpsourceplugin.h index f1a05bde3..a81fa700d 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.h +++ b/plugins/channeltx/udpsource/udpsourceplugin.h @@ -37,7 +37,7 @@ public: void initPlugin(PluginAPI* pluginAPI); virtual void createTxChannel(DeviceAPI *deviceAPI, BasebandSampleSource **bs, ChannelAPI **cs) const; - virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; + virtual ChannelGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index 05d2f67d3..be3b82679 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -32,6 +32,7 @@ class BasebandSampleSink; class BasebandSampleSource; class MIMOChannel; class ChannelAPI; +class ChannelGUI; class ChannelWebAPIAdapter; class DeviceWebAPIAdapter; class FeatureWebAPIAdapter; @@ -134,7 +135,7 @@ public: (void) cs; } - virtual PluginInstanceGUI* createRxChannelGUI( + virtual ChannelGUI* createRxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const { @@ -152,7 +153,7 @@ public: (void) cs; } - virtual PluginInstanceGUI* createTxChannelGUI( + virtual ChannelGUI* createTxChannelGUI( DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const { @@ -170,7 +171,7 @@ public: (void) cs; } - virtual PluginInstanceGUI* createMIMOChannelGUI( + virtual ChannelGUI* createMIMOChannelGUI( DeviceUISet *deviceUISet, MIMOChannel *mimoChannel) const { diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index 86d15d51f..99e04e1c0 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -69,6 +69,8 @@ set(sdrgui_SOURCES device/deviceuiset.cpp + channel/channelgui.cpp + feature/featuregui.cpp feature/featureuiset.cpp @@ -153,6 +155,8 @@ set(sdrgui_HEADERS device/deviceuiset.h + channel/channelgui.h + feature/featuregui.h feature/featureuiset.h diff --git a/sdrgui/channel/channelgui.cpp b/sdrgui/channel/channelgui.cpp new file mode 100644 index 000000000..96088e361 --- /dev/null +++ b/sdrgui/channel/channelgui.cpp @@ -0,0 +1,27 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2020 Edouard Griffiths, F4EXB // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#include + +#include "channelgui.h" + +void ChannelGUI::closeEvent(QCloseEvent *event) +{ + qDebug("ChannelGUI::closeEvent"); + emit closing(); + event->accept(); +} diff --git a/sdrgui/channel/channelgui.h b/sdrgui/channel/channelgui.h new file mode 100644 index 000000000..6a0c99868 --- /dev/null +++ b/sdrgui/channel/channelgui.h @@ -0,0 +1,49 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2020 Edouard Griffiths, F4EXB // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef SDRGUI_CHANNEL_CHANNELGUI_H_ +#define SDRGUI_CHANNEL_CHANNELGUI_H_ + +#include "gui/rollupwidget.h" + +class QCloseEvent; +class MessageQueue; + +class ChannelGUI : public RollupWidget +{ + Q_OBJECT +public: + ChannelGUI(QWidget *parent = nullptr) : + RollupWidget(parent) + { } + virtual ~ChannelGUI() { } + virtual void destroy() = 0; + + virtual void resetToDefaults() = 0; + virtual QByteArray serialize() const = 0; + virtual bool deserialize(const QByteArray& data) = 0; + + virtual MessageQueue* getInputMessageQueue() = 0; + +protected: + void closeEvent(QCloseEvent *event); + +signals: + void closing(); +}; + +#endif // SDRGUI_CHANNEL_CHANNELGUI_H_ diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index ee8d74081..5bec455bf 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -30,6 +30,7 @@ #include "plugin/plugininterface.h" #include "channel/channelutils.h" #include "channel/channelapi.h" +#include "channel/channelgui.h" #include "settings/preset.h" #include "deviceuiset.h" @@ -93,22 +94,22 @@ void DeviceUISet::addRollupWidget(QWidget *widget) m_channelWindow->addRollupWidget(widget); } -void DeviceUISet::registerRxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI) +void DeviceUISet::registerRxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* pluginGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, pluginGUI, 0)); } -void DeviceUISet::registerTxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI) +void DeviceUISet::registerTxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* pluginGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, pluginGUI, 1)); } -void DeviceUISet::registerChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI) +void DeviceUISet::registerChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* pluginGUI) { m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, channelAPI, pluginGUI, 2)); } -void DeviceUISet::removeRxChannelInstance(PluginInstanceGUI* pluginGUI) +void DeviceUISet::removeRxChannelInstance(ChannelGUI* pluginGUI) { for (ChannelInstanceRegistrations::iterator it = m_channelInstanceRegistrations.begin(); it != m_channelInstanceRegistrations.end(); ++it) { @@ -120,7 +121,7 @@ void DeviceUISet::removeRxChannelInstance(PluginInstanceGUI* pluginGUI) } } -void DeviceUISet::removeTxChannelInstance(PluginInstanceGUI* pluginGUI) +void DeviceUISet::removeTxChannelInstance(ChannelGUI* pluginGUI) { for (ChannelInstanceRegistrations::iterator it = m_channelInstanceRegistrations.begin(); it != m_channelInstanceRegistrations.end(); ++it) { @@ -132,7 +133,7 @@ void DeviceUISet::removeTxChannelInstance(PluginInstanceGUI* pluginGUI) } } -void DeviceUISet::removeChannelInstance(PluginInstanceGUI* pluginGUI) +void DeviceUISet::removeChannelInstance(ChannelGUI* pluginGUI) { for (ChannelInstanceRegistrations::iterator it = m_channelInstanceRegistrations.begin(); it != m_channelInstanceRegistrations.end(); ++it) { @@ -188,7 +189,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA for (int i = 0; i < preset->getChannelCount(); i++) { const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i); - PluginInstanceGUI *rxChannelGUI = nullptr; + ChannelGUI *rxChannelGUI = nullptr; // create channel instance @@ -264,7 +265,7 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA for(int i = 0; i < preset->getChannelCount(); i++) { const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i); - PluginInstanceGUI *txChannelGUI = nullptr; + ChannelGUI *txChannelGUI = nullptr; // create channel instance @@ -340,7 +341,7 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi for (int i = 0; i < preset->getChannelCount(); i++) { const Preset::ChannelConfig& channelConfig = preset->getChannelConfig(i); - PluginInstanceGUI *mimoChannelGUI = nullptr; + ChannelGUI *mimoChannelGUI = nullptr; // create channel instance diff --git a/sdrgui/device/deviceuiset.h b/sdrgui/device/deviceuiset.h index 243e9b980..d3422c337 100644 --- a/sdrgui/device/deviceuiset.h +++ b/sdrgui/device/deviceuiset.h @@ -35,6 +35,7 @@ class ChannelMarker; class PluginAPI; class PluginInstanceGUI; class ChannelAPI; +class ChannelGUI; class Preset; class SDRGUI_API DeviceUISet @@ -68,12 +69,12 @@ public: void saveTxChannelSettings(Preset* preset); void loadMIMOChannelSettings(const Preset* preset, PluginAPI *pluginAPI); void saveMIMOChannelSettings(Preset* preset); - void registerRxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI); - void registerTxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI); - void registerChannelInstance(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI); - void removeRxChannelInstance(PluginInstanceGUI* pluginGUI); - void removeTxChannelInstance(PluginInstanceGUI* pluginGUI); - void removeChannelInstance(PluginInstanceGUI* pluginGUI); + void registerRxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI); + void registerTxChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI); + void registerChannelInstance(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI); + void removeRxChannelInstance(ChannelGUI* channelGUI); + void removeTxChannelInstance(ChannelGUI* channelGUI); + void removeChannelInstance(ChannelGUI* channelGUI); // These are the number of channel types available for selection void setNumberOfAvailableRxChannels(int number) { m_nbAvailableRxChannels = number; } @@ -88,7 +89,7 @@ private: { QString m_channelName; ChannelAPI *m_channelAPI; - PluginInstanceGUI* m_gui; + ChannelGUI* m_gui; int m_channelType; ChannelInstanceRegistration() : @@ -98,10 +99,10 @@ private: m_channelType(0) { } - ChannelInstanceRegistration(const QString& channelName, ChannelAPI *channelAPI, PluginInstanceGUI* pluginGUI, int channelType) : + ChannelInstanceRegistration(const QString& channelName, ChannelAPI *channelAPI, ChannelGUI* channelGUI, int channelType) : m_channelName(channelName), m_channelAPI(channelAPI), - m_gui(pluginGUI), + m_gui(channelGUI), m_channelType(channelType) { } diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 210cb4128..54256d0ff 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -36,6 +36,7 @@ #include "device/deviceuiset.h" #include "device/deviceenumerator.h" #include "channel/channelapi.h" +#include "channel/channelgui.h" #include "feature/featureuiset.h" #include "feature/feature.h" #include "gui/indicator.h" @@ -1921,8 +1922,15 @@ void MainWindow::channelAddClicked(int channelIndex) ChannelAPI *channelAPI; BasebandSampleSink *rxChannel; pluginInterface->createRxChannel(deviceUI->m_deviceAPI, &rxChannel, &channelAPI); - PluginInstanceGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel); + ChannelGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel); deviceUI->registerRxChannelInstance(channelAPI->getURI(), channelAPI, gui); + QObject::connect( + gui, + &ChannelGUI::closing, + this, + [=](){ this->handleClosingRxChannelGUI(deviceUI, gui); }, + Qt::QueuedConnection + ); } else if (deviceUI->m_deviceSinkEngine) // sink device => Tx channels { @@ -1931,8 +1939,15 @@ void MainWindow::channelAddClicked(int channelIndex) ChannelAPI *channelAPI; BasebandSampleSource *txChannel; pluginInterface->createTxChannel(deviceUI->m_deviceAPI, &txChannel, &channelAPI); - PluginInstanceGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel); + ChannelGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel); deviceUI->registerTxChannelInstance(channelAPI->getURI(), channelAPI, gui); + QObject::connect( + gui, + &ChannelGUI::closing, + this, + [=](){ this->handleClosingTxChannelGUI(deviceUI, gui); }, + Qt::QueuedConnection + ); } else if (deviceUI->m_deviceMIMOEngine) // MIMO device => all possible channels. Depends on index range { @@ -1948,8 +1963,15 @@ void MainWindow::channelAddClicked(int channelIndex) ChannelAPI *channelAPI; BasebandSampleSink *rxChannel; pluginInterface->createRxChannel(deviceUI->m_deviceAPI, &rxChannel, &channelAPI); - PluginInstanceGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel); + ChannelGUI *gui = pluginInterface->createRxChannelGUI(deviceUI, rxChannel); deviceUI->registerRxChannelInstance(channelAPI->getURI(), channelAPI, gui); + QObject::connect( + gui, + &ChannelGUI::closing, + this, + [=](){ this->handleClosingRxChannelGUI(deviceUI, gui); }, + Qt::QueuedConnection + ); } else if (channelIndex < nbRxChannels + nbTxChannels) { @@ -1958,8 +1980,15 @@ void MainWindow::channelAddClicked(int channelIndex) ChannelAPI *channelAPI; BasebandSampleSource *txChannel; pluginInterface->createTxChannel(deviceUI->m_deviceAPI, &txChannel, &channelAPI); - PluginInstanceGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel); + ChannelGUI *gui = pluginInterface->createTxChannelGUI(deviceUI, txChannel); deviceUI->registerTxChannelInstance(channelAPI->getURI(), channelAPI, gui); + QObject::connect( + gui, + &ChannelGUI::closing, + this, + [=](){ this->handleClosingTxChannelGUI(deviceUI, gui); }, + Qt::QueuedConnection + ); } } } @@ -2148,3 +2177,18 @@ void MainWindow::commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifie } } } + +void MainWindow::handleClosingRxChannelGUI(DeviceUISet *deviceUISet, ChannelGUI *gui) +{ + deviceUISet->removeRxChannelInstance(gui); +} + +void MainWindow::handleClosingTxChannelGUI(DeviceUISet *deviceUISet, ChannelGUI *gui) +{ + deviceUISet->removeTxChannelInstance(gui); +} + +void MainWindow::handleClosingMIMOChannelGUI(DeviceUISet *deviceUISet, ChannelGUI *gui) +{ + deviceUISet->removeChannelInstance(gui); +} diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h index dd42822ff..6e7047a71 100644 --- a/sdrgui/mainwindow.h +++ b/sdrgui/mainwindow.h @@ -40,6 +40,7 @@ class Indicator; class GLSpectrumGUI; class PluginAPI; class PluginInstanceGUI; +class ChannelGUI; class ChannelMarker; class PluginManager; class DeviceAPI; @@ -532,6 +533,9 @@ private slots: void tabInputViewIndexChanged(); void tabChannelsIndexChanged(); void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release); + void handleClosingRxChannelGUI(DeviceUISet *deviceUISet, ChannelGUI *gui); + void handleClosingTxChannelGUI(DeviceUISet *deviceUISet, ChannelGUI *gui); + void handleClosingMIMOChannelGUI(DeviceUISet *deviceUISet, ChannelGUI *gui); }; #endif // INCLUDE_MAINWINDOW_H