VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GUI segregation: renamed PluginGUI interface to PluginInstanceUI

This commit is contained in:
f4exb 2017-09-03 19:55:00 +02:00
parent e281d8fd32
commit a6d6a717ae
116 changed files with 191 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -173,7 +173,6 @@ set(sdrbase_SOURCES
sdrbase/dsp/devicesamplesink.cpp
sdrbase/plugin/pluginapi.cpp
#sdrbase/plugin/plugingui.cpp
sdrbase/plugin/plugininterface.cpp
sdrbase/plugin/pluginmanager.cpp
@ -295,7 +294,7 @@ set(sdrbase_HEADERS
sdrbase/dsp/devicesamplesink.h
sdrbase/plugin/pluginapi.h
sdrbase/plugin/plugingui.h
sdrbase/plugin/plugininstanceui.h
sdrbase/plugin/plugininterface.h
sdrbase/plugin/pluginmanager.h

4
plugins/channelrx/chanalyzer/chanalyzergui.h
View File

@ -17,8 +17,8 @@
#ifndef INCLUDE_CHANNELANALYZERGUI_H
#define INCLUDE_CHANNELANALYZERGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -36,7 +36,7 @@ namespace Ui {
class ChannelAnalyzerGUI;
}
class ChannelAnalyzerGUI : public RollupWidget, public PluginGUI {
class ChannelAnalyzerGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/chanalyzer/chanalyzerplugin.cpp
View File

@ -33,7 +33,7 @@ void ChannelAnalyzerPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(ChannelAnalyzerGUI::m_channelID, this);
}
PluginGUI* ChannelAnalyzerPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* ChannelAnalyzerPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == ChannelAnalyzerGUI::m_channelID)
{

2
plugins/channelrx/chanalyzer/chanalyzerplugin.h
View File

@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/chanalyzerng/chanalyzernggui.h
View File

@ -17,8 +17,8 @@
#ifndef INCLUDE_CHANNELANALYZERNGGUI_H
#define INCLUDE_CHANNELANALYZERNGGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -36,7 +36,7 @@ namespace Ui {
class ChannelAnalyzerNGGUI;
}
class ChannelAnalyzerNGGUI : public RollupWidget, public PluginGUI {
class ChannelAnalyzerNGGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp
View File

@ -48,7 +48,7 @@ void ChannelAnalyzerNGPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(ChannelAnalyzerNGGUI::m_channelID, this);
}
PluginGUI* ChannelAnalyzerNGPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* ChannelAnalyzerNGPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == ChannelAnalyzerNGGUI::m_channelID)
{

2
plugins/channelrx/chanalyzerng/chanalyzerngplugin.h
View File

@ -34,7 +34,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/demodam/amdemodgui.h
View File

@ -1,8 +1,8 @@
#ifndef INCLUDE_AMDEMODGUI_H
#define INCLUDE_AMDEMODGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -17,7 +17,7 @@ namespace Ui {
class AMDemodGUI;
}
class AMDemodGUI : public RollupWidget, public PluginGUI {
class AMDemodGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/demodam/amdemodplugin.cpp
View File

@ -33,7 +33,7 @@ void AMDemodPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(AMDemodGUI::m_channelID, this);
}
PluginGUI* AMDemodPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* AMDemodPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == AMDemodGUI::m_channelID)
{

2
plugins/channelrx/demodam/amdemodplugin.h
View File

@ -33,7 +33,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/demodatv/atvdemodgui.h
View File

@ -18,8 +18,8 @@
#ifndef INCLUDE_ATVDEMODGUI_H
#define INCLUDE_ATVDEMODGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -36,7 +36,7 @@ namespace Ui
class ATVDemodGUI;
}
class ATVDemodGUI : public RollupWidget, public PluginGUI
class ATVDemodGUI : public RollupWidget, public PluginInstanceUI
{
Q_OBJECT

2
plugins/channelrx/demodatv/atvdemodplugin.cpp
View File

@ -53,7 +53,7 @@ void ATVDemodPlugin::initPlugin(PluginAPI* ptrPluginAPI)
m_ptrPluginAPI->registerRxChannel(ATVDemodGUI::m_strChannelID, this);
}
PluginGUI* ATVDemodPlugin::createRxChannel(const QString& strChannelName, DeviceSourceAPI *ptrDeviceAPI)
PluginInstanceUI* ATVDemodPlugin::createRxChannel(const QString& strChannelName, DeviceSourceAPI *ptrDeviceAPI)
{
if(strChannelName == ATVDemodGUI::m_strChannelID)
{

2
plugins/channelrx/demodatv/atvdemodplugin.h
View File

@ -35,7 +35,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* ptrPluginAPI);
PluginGUI* createRxChannel(const QString& strChannelName, DeviceSourceAPI *ptrDeviceAPI);
PluginInstanceUI* createRxChannel(const QString& strChannelName, DeviceSourceAPI *ptrDeviceAPI);
private:
static const PluginDescriptor m_ptrPluginDescriptor;

4
plugins/channelrx/demodbfm/bfmdemodgui.h
View File

@ -18,8 +18,8 @@
#ifndef INCLUDE_BFMDEMODGUI_H
#define INCLUDE_BFMDEMODGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -37,7 +37,7 @@ namespace Ui {
class BFMDemodGUI;
}
class BFMDemodGUI : public RollupWidget, public PluginGUI {
class BFMDemodGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/demodbfm/bfmplugin.cpp
View File

@ -50,7 +50,7 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(BFMDemodGUI::m_channelID, this);
}
PluginGUI* BFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* BFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == BFMDemodGUI::m_channelID)
{

2
plugins/channelrx/demodbfm/bfmplugin.h
View File

@ -34,7 +34,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/demoddsd/dsddemodgui.h
View File

@ -18,10 +18,10 @@
#ifndef INCLUDE_DSDDEMODGUI_H
#define INCLUDE_DSDDEMODGUI_H
#include <plugin/plugininstanceui.h>
#include <QMenu>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/dsptypes.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -38,7 +38,7 @@ namespace Ui {
class DSDDemodGUI;
}
class DSDDemodGUI : public RollupWidget, public PluginGUI {
class DSDDemodGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/demoddsd/dsddemodplugin.cpp
View File

@ -50,7 +50,7 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(DSDDemodGUI::m_channelID, this);
}
PluginGUI* DSDDemodPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* DSDDemodPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == DSDDemodGUI::m_channelID)
{

2
plugins/channelrx/demoddsd/dsddemodplugin.h
View File

@ -34,7 +34,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/demodlora/lorademodgui.h
View File

@ -1,8 +1,8 @@
#ifndef INCLUDE_LoRaDEMODGUI_H
#define INCLUDE_LoRaDEMODGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#define BANDWIDTHSTRING {7813,15625,20833,31250,62500}
@ -18,7 +18,7 @@ namespace Ui {
class LoRaDemodGUI;
}
class LoRaDemodGUI : public RollupWidget, public PluginGUI {
class LoRaDemodGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/demodlora/loraplugin.cpp
View File

@ -33,7 +33,7 @@ void LoRaPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(LoRaDemodGUI::m_channelID, this);
}
PluginGUI* LoRaPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* LoRaPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == LoRaDemodGUI::m_channelID)
{

2
plugins/channelrx/demodlora/loraplugin.h
View File

@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/demodnfm/nfmdemodgui.h
View File

@ -1,8 +1,8 @@
#ifndef INCLUDE_NFMDEMODGUI_H
#define INCLUDE_NFMDEMODGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/dsptypes.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -18,7 +18,7 @@ namespace Ui {
class NFMDemodGUI;
}
class NFMDemodGUI : public RollupWidget, public PluginGUI {
class NFMDemodGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/demodnfm/nfmplugin.cpp
View File

@ -33,7 +33,7 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(NFMDemodGUI::m_channelID, this);
}
PluginGUI* NFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* NFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == NFMDemodGUI::m_channelID) {
NFMDemodGUI* gui = NFMDemodGUI::create(m_pluginAPI, deviceAPI);

2
plugins/channelrx/demodnfm/nfmplugin.h
View File

@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/demodssb/ssbdemodgui.h
View File

@ -1,8 +1,8 @@
#ifndef INCLUDE_SSBDEMODGUI_H
#define INCLUDE_SSBDEMODGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -19,7 +19,7 @@ namespace Ui {
class SSBDemodGUI;
}
class SSBDemodGUI : public RollupWidget, public PluginGUI {
class SSBDemodGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/demodssb/ssbplugin.cpp
View File

@ -33,7 +33,7 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(SSBDemodGUI::m_channelID, this);
}
PluginGUI* SSBPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* SSBPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == SSBDemodGUI::m_channelID)
{

2
plugins/channelrx/demodssb/ssbplugin.h
View File

@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/demodwfm/wfmdemodgui.h
View File

@ -1,8 +1,8 @@
#ifndef INCLUDE_WFMDEMODGUI_H
#define INCLUDE_WFMDEMODGUI_H
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -17,7 +17,7 @@ namespace Ui {
class WFMDemodGUI;
}
class WFMDemodGUI : public RollupWidget, public PluginGUI {
class WFMDemodGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/demodwfm/wfmplugin.cpp
View File

@ -33,7 +33,7 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(WFMDemodGUI::m_channelID, this);
}
PluginGUI* WFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* WFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == WFMDemodGUI::m_channelID)
{

2
plugins/channelrx/demodwfm/wfmplugin.h
View File

@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/tcpsrc/tcpsrcgui.h
View File

@ -1,9 +1,9 @@
#ifndef INCLUDE_TCPSRCGUI_H
#define INCLUDE_TCPSRCGUI_H
#include <plugin/plugininstanceui.h>
#include <QHostAddress>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -20,7 +20,7 @@ namespace Ui {
class TCPSrcGUI;
}
class TCPSrcGUI : public RollupWidget, public PluginGUI {
class TCPSrcGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/tcpsrc/tcpsrcplugin.cpp
View File

@ -33,7 +33,7 @@ void TCPSrcPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(TCPSrcGUI::m_channelID, this);
}
PluginGUI* TCPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* TCPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == TCPSrcGUI::m_channelID)
{

2
plugins/channelrx/tcpsrc/tcpsrcplugin.h
View File

@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channelrx/udpsrc/udpsrcgui.h
View File

@ -18,9 +18,9 @@
#ifndef INCLUDE_UDPSRCGUI_H
#define INCLUDE_UDPSRCGUI_H
#include <plugin/plugininstanceui.h>
#include <QHostAddress>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -37,7 +37,7 @@ namespace Ui {
class UDPSrcGUI;
}
class UDPSrcGUI : public RollupWidget, public PluginGUI {
class UDPSrcGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channelrx/udpsrc/udpsrcplugin.cpp
View File

@ -50,7 +50,7 @@ void UDPSrcPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerRxChannel(UDPSrcGUI::m_channelID, this);
}
PluginGUI* UDPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* UDPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == UDPSrcGUI::m_channelID)
{

2
plugins/channelrx/udpsrc/udpsrcplugin.h
View File

@ -34,7 +34,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
PluginInstanceUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channeltx/modam/ammodgui.h
View File

@ -17,8 +17,8 @@
#ifndef PLUGINS_CHANNELTX_MODAM_AMMODGUI_H_
#define PLUGINS_CHANNELTX_MODAM_AMMODGUI_H_
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "ammod.h"
@ -34,7 +34,7 @@ namespace Ui {
class AMModGUI;
}
class AMModGUI : public RollupWidget, public PluginGUI {
class AMModGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channeltx/modam/ammodplugin.cpp
View File

@ -49,7 +49,7 @@ void AMModPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerTxChannel(AMModGUI::m_channelID, this);
}
PluginGUI* AMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* AMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
{
if(channelName == AMModGUI::m_channelID)
{

2
plugins/channeltx/modam/ammodplugin.h
View File

@ -33,7 +33,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channeltx/modatv/atvmodgui.h
View File

@ -17,8 +17,8 @@
#ifndef PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_
#define PLUGINS_CHANNELTX_MODTV_ATVMODGUI_H_
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "atvmod.h"
@ -35,7 +35,7 @@ namespace Ui {
class ATVModGUI;
}
class ATVModGUI : public RollupWidget, public PluginGUI {
class ATVModGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channeltx/modatv/atvmodplugin.cpp
View File

@ -49,7 +49,7 @@ void ATVModPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerTxChannel(ATVModGUI::m_channelID, this);
}
PluginGUI* ATVModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* ATVModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
{
if(channelName == ATVModGUI::m_channelID)
{

2
plugins/channeltx/modatv/atvmodplugin.h
View File

@ -33,7 +33,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channeltx/modnfm/nfmmodgui.h
View File

@ -17,8 +17,8 @@
#ifndef PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
#define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -35,7 +35,7 @@ namespace Ui {
class NFMModGUI;
}
class NFMModGUI : public RollupWidget, public PluginGUI {
class NFMModGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channeltx/modnfm/nfmmodplugin.cpp
View File

@ -49,7 +49,7 @@ void NFMModPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerTxChannel(NFMModGUI::m_channelID, this);
}
PluginGUI* NFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* NFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
{
if(channelName == NFMModGUI::m_channelID)
{

2
plugins/channeltx/modnfm/nfmmodplugin.h
View File

@ -33,7 +33,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channeltx/modssb/ssbmodgui.h
View File

@ -17,8 +17,8 @@
#ifndef PLUGINS_CHANNELTX_MODSSB_SSBMODGUI_H_
#define PLUGINS_CHANNELTX_MODSSB_SSBMODGUI_H_
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "ssbmod.h"
@ -35,7 +35,7 @@ namespace Ui {
class SSBModGUI;
}
class SSBModGUI : public RollupWidget, public PluginGUI {
class SSBModGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channeltx/modssb/ssbmodplugin.cpp
View File

@ -49,7 +49,7 @@ void SSBModPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerTxChannel(SSBModGUI::m_channelID, this);
}
PluginGUI* SSBModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* SSBModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
{
if(channelName == SSBModGUI::m_channelID)
{

2
plugins/channeltx/modssb/ssbmodplugin.h
View File

@ -33,7 +33,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channeltx/modwfm/wfmmodgui.h
View File

@ -17,8 +17,8 @@
#ifndef PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_
#define PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_
#include <plugin/plugininstanceui.h>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
@ -35,7 +35,7 @@ namespace Ui {
class WFMModGUI;
}
class WFMModGUI : public RollupWidget, public PluginGUI {
class WFMModGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channeltx/modwfm/wfmmodplugin.cpp
View File

@ -49,7 +49,7 @@ void WFMModPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerTxChannel(WFMModGUI::m_channelID, this);
}
PluginGUI* WFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* WFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
{
if(channelName == WFMModGUI::m_channelID)
{

2
plugins/channeltx/modwfm/wfmmodplugin.h
View File

@ -33,7 +33,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/channeltx/udpsink/udpsinkgui.h
View File

@ -17,10 +17,10 @@
#ifndef PLUGINS_CHANNELTX_UDPSINK_UDPSINKGUI_H_
#define PLUGINS_CHANNELTX_UDPSINK_UDPSINKGUI_H_
#include <plugin/plugininstanceui.h>
#include <QObject>
#include "gui/rollupwidget.h"
#include "plugin/plugingui.h"
#include "dsp/channelmarker.h"
#include "udpsink.h"
@ -36,7 +36,7 @@ namespace Ui {
class UDPSinkGUI;
}
class UDPSinkGUI : public RollupWidget, public PluginGUI {
class UDPSinkGUI : public RollupWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/channeltx/udpsink/udpsinkplugin.cpp
View File

@ -50,7 +50,7 @@ void UDPSinkPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerTxChannel(UDPSinkGUI::m_channelID, this);
}
PluginGUI* UDPSinkPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* UDPSinkPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
{
if(channelName == UDPSinkGUI::m_channelID)
{

2
plugins/channeltx/udpsink/udpsinkplugin.h
View File

@ -34,7 +34,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
PluginInstanceUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

5
plugins/samplesink/bladerfoutput/bladerfoutputgui.h
View File

@ -17,11 +17,10 @@
#ifndef INCLUDE_BLADERFOUTPUTGUI_H
#define INCLUDE_BLADERFOUTPUTGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "bladerfoutput.h"
class DeviceSinkAPI;
@ -32,7 +31,7 @@ namespace Ui {
class BladerfOutputGui;
}
class BladerfOutputGui : public QWidget, public PluginGUI {
class BladerfOutputGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp
View File

@ -77,7 +77,7 @@ PluginInterface::SamplingDevices BladerfOutputPlugin::enumSampleSinks()
return result;
}
PluginGUI* BladerfOutputPlugin::createSampleSinkPluginGUI(const QString& sinkId,QWidget **widget, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* BladerfOutputPlugin::createSampleSinkPluginGUI(const QString& sinkId,QWidget **widget, DeviceSinkAPI *deviceAPI)
{
if(sinkId == m_deviceTypeID)
{

2
plugins/samplesink/bladerfoutput/bladerfoutputplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSinks();
virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesink/filesink/filesinkgui.h
View File

@ -17,12 +17,12 @@
#ifndef INCLUDE_FILESINKGUI_H
#define INCLUDE_FILESINKGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "filesinkoutput.h"
#include "filesinksettings.h"
#include "plugin/plugingui.h"
class DeviceSinkAPI;
@ -32,7 +32,7 @@ namespace Ui {
class FileSinkGui;
}
class FileSinkGui : public QWidget, public PluginGUI {
class FileSinkGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesink/filesink/filesinkplugin.cpp
View File

@ -69,7 +69,7 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks()
return result;
}
PluginGUI* FileSinkPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* FileSinkPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI)
{
if(sinkId == m_deviceTypeID)
{

2
plugins/samplesink/filesink/filesinkplugin.h
View File

@ -37,7 +37,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSinks();
virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesink/hackrfoutput/hackrfoutputgui.h
View File

@ -17,10 +17,10 @@
#ifndef INCLUDE_HACKRFOUTPUTGUI_H
#define INCLUDE_HACKRFOUTPUTGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "hackrfoutput.h"
#define HACKRF_MAX_DEVICE (32)
@ -32,7 +32,7 @@ namespace Ui {
class HackRFOutputGui;
}
class HackRFOutputGui : public QWidget, public PluginGUI {
class HackRFOutputGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp
View File

@ -116,7 +116,7 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks()
return result;
}
PluginGUI* HackRFOutputPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* HackRFOutputPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI)
{
if(sinkId == m_deviceTypeID)
{

2
plugins/samplesink/hackrfoutput/hackrfoutputplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSinks();
virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesink/limesdroutput/limesdroutputgui.h
View File

@ -17,10 +17,10 @@
#ifndef PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_LIMESDROUTPUT_LIMESDROUTPUTGUI_H_
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "limesdroutput.h"
class DeviceSinkAPI;
@ -31,7 +31,7 @@ namespace Ui {
class LimeSDROutputGUI;
}
class LimeSDROutputGUI : public QWidget, public PluginGUI {
class LimeSDROutputGUI : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
View File

@ -96,7 +96,7 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks()
return result;
}
PluginGUI* LimeSDROutputPlugin::createSampleSinkPluginGUI(const QString& sinkId,QWidget **widget, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* LimeSDROutputPlugin::createSampleSinkPluginGUI(const QString& sinkId,QWidget **widget, DeviceSinkAPI *deviceAPI)
{
if(sinkId == m_deviceTypeID)
{

2
plugins/samplesink/limesdroutput/limesdroutputplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSinks();
virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h
View File

@ -17,11 +17,11 @@
#ifndef INCLUDE_SDRDAEMONSINKGUI_H
#define INCLUDE_SDRDAEMONSINKGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QTime>
#include <QWidget>
#include "plugin/plugingui.h"
#include "sdrdaemonsinksettings.h"
#include "sdrdaemonsinkoutput.h"
@ -33,7 +33,7 @@ namespace Ui {
class SDRdaemonSinkGui;
}
class SDRdaemonSinkGui : public QWidget, public PluginGUI {
class SDRdaemonSinkGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp
View File

@ -70,7 +70,7 @@ PluginInterface::SamplingDevices SDRdaemonSinkPlugin::enumSampleSinks()
return result;
}
PluginGUI* SDRdaemonSinkPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI)
PluginInstanceUI* SDRdaemonSinkPlugin::createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI)
{
if(sinkId == m_deviceTypeID)
{

2
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.h
View File

@ -37,7 +37,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSinks();
virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesource/airspy/airspygui.h
View File

@ -17,11 +17,11 @@
#ifndef INCLUDE_AIRSPYGUI_H
#define INCLUDE_AIRSPYGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "airspyinput.h"
#include "plugin/plugingui.h"
#define AIRSPY_MAX_DEVICE (32)
@ -33,7 +33,7 @@ namespace Ui {
class AirspySampleRates;
}
class AirspyGui : public QWidget, public PluginGUI {
class AirspyGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/airspy/airspyplugin.cpp
View File

@ -119,7 +119,7 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources()
return result;
}
PluginGUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if (sourceId == m_deviceTypeID)
{

2
plugins/samplesource/airspy/airspyplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesource/bladerfinput/bladerfinputgui.h
View File

@ -17,10 +17,10 @@
#ifndef INCLUDE_BLADERFINPUTGUI_H
#define INCLUDE_BLADERFINPUTGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "bladerfinput.h"
class DeviceSourceAPI;
@ -30,7 +30,7 @@ namespace Ui {
class BladerfInputGui;
}
class BladerfInputGui : public QWidget, public PluginGUI {
class BladerfInputGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
View File

@ -78,7 +78,7 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources()
return result;
}
PluginGUI* BlderfInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* BlderfInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/bladerfinput/bladerfinputplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesource/fcdpro/fcdprogui.h
View File

@ -17,11 +17,11 @@
#ifndef INCLUDE_FCDPROGUI_H
#define INCLUDE_FCDPROGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "fcdproinput.h"
#include "plugin/plugingui.h"
class DeviceSourceAPI;
class FileRecord;
@ -31,7 +31,7 @@ namespace Ui {
class FCDProGui;
}
class FCDProGui : public QWidget, public PluginGUI {
class FCDProGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/fcdpro/fcdproplugin.cpp
View File

@ -74,7 +74,7 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources()
return result;
}
PluginGUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == fcd_traits<Pro>::interfaceIID)
{

2
plugins/samplesource/fcdpro/fcdproplugin.h
View File

@ -20,7 +20,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;

4
plugins/samplesource/fcdproplus/fcdproplusgui.h
View File

@ -17,11 +17,11 @@
#ifndef INCLUDE_FCDGUI_H
#define INCLUDE_FCDGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "fcdproplusinput.h"
#include "plugin/plugingui.h"
class DeviceSourceAPI;
class FileRecord;
@ -30,7 +30,7 @@ namespace Ui {
class FCDProPlusGui;
}
class FCDProPlusGui : public QWidget, public PluginGUI {
class FCDProPlusGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
View File

@ -76,7 +76,7 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources()
return result;
}
PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == fcd_traits<ProPlus>::interfaceIID)
{

2
plugins/samplesource/fcdproplus/fcdproplusplugin.h
View File

@ -20,7 +20,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;

5
plugins/samplesource/filesource/filesourcegui.h
View File

@ -17,11 +17,10 @@
#ifndef INCLUDE_FILESOURCEGUI_H
#define INCLUDE_FILESOURCEGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "filesourceinput.h"
class DeviceSourceAPI;
@ -30,7 +29,7 @@ namespace Ui {
class FileSourceGui;
}
class FileSourceGui : public QWidget, public PluginGUI {
class FileSourceGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/filesource/filesourceplugin.cpp
View File

@ -69,7 +69,7 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources()
return result;
}
PluginGUI* FileSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* FileSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/filesource/filesourceplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesource/hackrfinput/hackrfinputgui.h
View File

@ -17,10 +17,10 @@
#ifndef INCLUDE_HACKRFINPUTGUI_H
#define INCLUDE_HACKRFINPUTGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "../hackrfinput/hackrfinput.h"
#define HACKRF_MAX_DEVICE (32)
@ -32,7 +32,7 @@ namespace Ui {
class HackRFInputGui;
}
class HackRFInputGui : public QWidget, public PluginGUI {
class HackRFInputGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
View File

@ -117,7 +117,7 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources()
return result;
}
PluginGUI* HackRFInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* HackRFInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/hackrfinput/hackrfinputplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesource/limesdrinput/limesdrinputgui.h
View File

@ -17,10 +17,10 @@
#ifndef PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTGUI_H_
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "limesdrinput.h"
class DeviceSourceAPI;
@ -30,7 +30,7 @@ namespace Ui {
class LimeSDRInputGUI;
}
class LimeSDRInputGUI : public QWidget, public PluginGUI {
class LimeSDRInputGUI : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
View File

@ -97,7 +97,7 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources()
return result;
}
PluginGUI* LimeSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* LimeSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/limesdrinput/limesdrinputplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesource/plutosdrinput/plutosdrinputgui.h
View File

@ -17,15 +17,15 @@
#ifndef PLUGINS_SAMPLESOURCE_PLUTOSDRINPUT_PLUTOSDRINPUTGUI_H_
#define PLUGINS_SAMPLESOURCE_PLUTOSDRINPUT_PLUTOSDRINPUTGUI_H_
#include <plugin/plugininstanceui.h>
#include <QObject>
#include <QWidget>
#include "plugin/plugingui.h"
#include "plutosdrinputsettings.h"
class DeviceSourceAPI;
class PlutoSDRInputGui : public QWidget, public PluginGUI {
class PlutoSDRInputGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
View File

@ -80,7 +80,7 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources()
return result;
}
PluginGUI* PlutoSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* PlutoSDRInputPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/plutosdrinput/plutosdrinputplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

4
plugins/samplesource/rtlsdr/rtlsdrgui.h
View File

@ -17,10 +17,10 @@
#ifndef INCLUDE_RTLSDRGUI_H
#define INCLUDE_RTLSDRGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include "plugin/plugingui.h"
#include "rtlsdrinput.h"
class DeviceSourceAPI;
@ -31,7 +31,7 @@ namespace Ui {
class RTLSDRSampleRates;
}
class RTLSDRGui : public QWidget, public PluginGUI {
class RTLSDRGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
View File

@ -62,7 +62,7 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources()
return result;
}
PluginGUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID) {
RTLSDRGui* gui = new RTLSDRGui(deviceAPI);

2
plugins/samplesource/rtlsdr/rtlsdrplugin.h
View File

@ -20,7 +20,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

5
plugins/samplesource/sdrdaemon/sdrdaemongui.h
View File

@ -17,12 +17,11 @@
#ifndef INCLUDE_SDRDAEMONGUI_H
#define INCLUDE_SDRDAEMONGUI_H
#include <plugin/plugininstanceui.h>
#include <QTimer>
#include <QWidget>
#include <sys/time.h>
#include "plugin/plugingui.h"
#include "sdrdaemoninput.h"
class DeviceSourceAPI;
@ -32,7 +31,7 @@ namespace Ui {
class SDRdaemonGui;
}
class SDRdaemonGui : public QWidget, public PluginGUI {
class SDRdaemonGui : public QWidget, public PluginInstanceUI {
Q_OBJECT
public:

2
plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp
View File

@ -69,7 +69,7 @@ PluginInterface::SamplingDevices SDRdaemonPlugin::enumSampleSources()
return result;
}
PluginGUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/sdrdaemon/sdrdaemonplugin.h
View File

@ -36,7 +36,7 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;

Some files were not shown because too many files have changed in this diff Show More