mirror of https://github.com/f4exb/sdrangel.git
Channel plugins: use specialized ChannelGUI superclass. Handle GUI lifecycle in MainWindow
This commit is contained in:
parent
4ab683fa7d
commit
b1c9a35dcb
|
@ -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;
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <QIcon>
|
||||
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#define INCLUDE_ATVDEMODGUI_H
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#define INCLUDE_BFMDEMODGUI_H
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <plugin/plugininstancegui.h>
|
||||
#include <QMenu>
|
||||
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <QIcon>
|
||||
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define INCLUDE_LoRaDEMODGUI_H
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define INCLUDE_NFMDEMODGUI_H
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <QIcon>
|
||||
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define INCLUDE_WFMDEMODGUI_H
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <QIcon>
|
||||
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#include <QHostAddress>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -18,8 +18,7 @@
|
|||
#ifndef PLUGINS_CHANNELTX_MODAM_AMMODGUI_H_
|
||||
#define PLUGINS_CHANNELTX_MODAM_AMMODGUI_H_
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#define PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <QIcon>
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#define PLUGINS_CHANNELTX_MODPACKET_PACKETMODGUI_H_
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <QIcon>
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#define PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_
|
||||
|
||||
#include <plugin/plugininstancegui.h>
|
||||
#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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue