mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

RxTx semantic move: renamed DeviceAPI to DeviceSourceAPI

pull/27/head
f4exb 2016-10-11 01:17:55 +02:00
rodzic 6b2e09ed10
commit 32595f81b9
106 zmienionych plików z 333 dodań i 313 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
CMakeLists.txt
Wyświetl plik

@ -168,7 +168,7 @@ set(sdrbase_SOURCES
sdrbase/util/simpleserializer.cpp
#sdrbase/util/spinlock.cpp
sdrbase/device/deviceapi.cpp
sdrbase/device/devicesourceapi.cpp
)
set(sdrbase_HEADERS
@ -263,7 +263,7 @@ set(sdrbase_HEADERS
sdrbase/util/simpleserializer.h
#sdrbase/util/spinlock.h
sdrbase/device/deviceapi.h
sdrbase/device/devicesourceapi.h
)
set(sdrbase_SOURCES

6
plugins/channelrx/chanalyzer/chanalyzergui.cpp
Wyświetl plik

@ -16,6 +16,7 @@
#include "../../channelrx/chanalyzer/chanalyzergui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
@ -28,7 +29,6 @@
#include "gui/glspectrum.h"
#include "gui/glscope.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingswidget.h"
@ -39,7 +39,7 @@
const QString ChannelAnalyzerGUI::m_channelID = "org.f4exb.sdrangelove.channel.chanalyzer";
ChannelAnalyzerGUI* ChannelAnalyzerGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
ChannelAnalyzerGUI* ChannelAnalyzerGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
ChannelAnalyzerGUI* gui = new ChannelAnalyzerGUI(pluginAPI, deviceAPI);
return gui;
@ -306,7 +306,7 @@ void ChannelAnalyzerGUI::onMenuDoubleClicked()
}
}
ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::ChannelAnalyzerGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/chanalyzer/chanalyzergui.h
Wyświetl plik

@ -23,7 +23,7 @@
#include "dsp/movingaverage.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
@ -40,7 +40,7 @@ class ChannelAnalyzerGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static ChannelAnalyzerGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static ChannelAnalyzerGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -72,7 +72,7 @@ private slots:
private:
Ui::ChannelAnalyzerGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
@ -87,7 +87,7 @@ private:
SpectrumVis* m_spectrumVis;
ScopeVis* m_scopeVis;
explicit ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~ChannelAnalyzerGUI();
int getEffectiveLowCutoff(int lowCutoff);

4
plugins/channelrx/chanalyzer/chanalyzerplugin.cpp
Wyświetl plik

@ -32,7 +32,7 @@ void ChannelAnalyzerPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(ChannelAnalyzerGUI::m_channelID, this);
}
PluginGUI* ChannelAnalyzerPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* ChannelAnalyzerPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == ChannelAnalyzerGUI::m_channelID)
{
@ -43,7 +43,7 @@ PluginGUI* ChannelAnalyzerPlugin::createChannel(const QString& channelName, Devi
}
}
void ChannelAnalyzerPlugin::createInstanceChannelAnalyzer(DeviceAPI *deviceAPI)
void ChannelAnalyzerPlugin::createInstanceChannelAnalyzer(DeviceSourceAPI *deviceAPI)
{
ChannelAnalyzerGUI* gui = ChannelAnalyzerGUI::create(m_pluginAPI, deviceAPI);
}

6
plugins/channelrx/chanalyzer/chanalyzerplugin.h
Wyświetl plik

@ -4,7 +4,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class ChannelAnalyzerPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -25,7 +25,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceChannelAnalyzer(DeviceAPI *deviceAPI);
void createInstanceChannelAnalyzer(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_CHANALYZERPLUGIN_H

6
plugins/channelrx/demodam/amdemodgui.cpp
Wyświetl plik

@ -1,5 +1,6 @@
#include "../../channelrx/demodam/amdemodgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
@ -7,7 +8,6 @@
#include "../../../sdrbase/dsp/threadedbasebandsamplesink.h"
#include "ui_amdemodgui.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingswidget.h"
@ -22,7 +22,7 @@ const int AMDemodGUI::m_rfBW[] = {
5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000
};
AMDemodGUI* AMDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
AMDemodGUI* AMDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
AMDemodGUI* gui = new AMDemodGUI(pluginAPI, deviceAPI);
return gui;
@ -204,7 +204,7 @@ void AMDemodGUI::onMenuDoubleClicked()
}
}
AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::AMDemodGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/demodam/amdemodgui.h
Wyświetl plik

@ -7,7 +7,7 @@
#include "dsp/movingaverage.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
@ -21,7 +21,7 @@ class AMDemodGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static AMDemodGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static AMDemodGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -53,7 +53,7 @@ private slots:
private:
Ui::AMDemodGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
@ -66,7 +66,7 @@ private:
static const int m_rfBW[];
explicit AMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit AMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~AMDemodGUI();
void blockApplySettings(bool block);

4
plugins/channelrx/demodam/amplugin.cpp
Wyświetl plik

@ -33,7 +33,7 @@ void AMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(AMDemodGUI::m_channelID, this);
}
PluginGUI* AMPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* AMPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == AMDemodGUI::m_channelID)
{
@ -44,7 +44,7 @@ PluginGUI* AMPlugin::createChannel(const QString& channelName, DeviceAPI *device
}
}
void AMPlugin::createInstanceAM(DeviceAPI *deviceAPI)
void AMPlugin::createInstanceAM(DeviceSourceAPI *deviceAPI)
{
AMDemodGUI* gui = AMDemodGUI::create(m_pluginAPI, deviceAPI);
}

6
plugins/channelrx/demodam/amplugin.h
Wyświetl plik

@ -4,7 +4,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class AMPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -25,7 +25,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceAM(DeviceAPI *deviceAPI);
void createInstanceAM(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_AMPLUGIN_H

6
plugins/channelrx/demodbfm/bfmdemodgui.cpp
Wyświetl plik

@ -17,6 +17,7 @@
#include "../../channelrx/demodbfm/bfmdemodgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
@ -31,7 +32,6 @@
#include "dsp/spectrumvis.h"
#include "gui/glspectrum.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingswidget.h"
@ -57,7 +57,7 @@ int requiredBW(int rfBW)
return 384000;
}
BFMDemodGUI* BFMDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
BFMDemodGUI* BFMDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
BFMDemodGUI* gui = new BFMDemodGUI(pluginAPI, deviceAPI);
return gui;
@ -360,7 +360,7 @@ void BFMDemodGUI::onMenuDoubleClicked()
}
}
BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::BFMDemodGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/demodbfm/bfmdemodgui.h
Wyświetl plik

@ -26,7 +26,7 @@
#include "../../channelrx/demodbfm/rdsparser.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
@ -41,7 +41,7 @@ class BFMDemodGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static BFMDemodGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static BFMDemodGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -82,7 +82,7 @@ private slots:
private:
Ui::BFMDemodGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
@ -100,7 +100,7 @@ private:
static const int m_rfBW[];
explicit BFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit BFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~BFMDemodGUI();
void blockApplySettings(bool block);

4
plugins/channelrx/demodbfm/bfmplugin.cpp
Wyświetl plik

@ -49,7 +49,7 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(BFMDemodGUI::m_channelID, this);
}
PluginGUI* BFMPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* BFMPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == BFMDemodGUI::m_channelID)
{
@ -60,7 +60,7 @@ PluginGUI* BFMPlugin::createChannel(const QString& channelName, DeviceAPI *devic
}
}
void BFMPlugin::createInstanceBFM(DeviceAPI *deviceAPI)
void BFMPlugin::createInstanceBFM(DeviceSourceAPI *deviceAPI)
{
BFMDemodGUI* gui = BFMDemodGUI::create(m_pluginAPI, deviceAPI);
}

6
plugins/channelrx/demodbfm/bfmplugin.h
Wyświetl plik

@ -21,7 +21,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class BFMPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -34,7 +34,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -42,7 +42,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceBFM(DeviceAPI *deviceAPI);
void createInstanceBFM(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_BFMPLUGIN_H

6
plugins/channelrx/demoddsd/dsddemodgui.cpp
Wyświetl plik

@ -17,6 +17,7 @@
#include "../../channelrx/demoddsd/dsddemodgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
@ -27,7 +28,6 @@
#include "dsp/scopevis.h"
#include "gui/glscope.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingswidget.h"
@ -75,7 +75,7 @@ const char * DSDDemodGUI::m_ysfCallModeText[4] = {
"IN" //!< Individual
};
DSDDemodGUI* DSDDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
DSDDemodGUI* DSDDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
DSDDemodGUI* gui = new DSDDemodGUI(pluginAPI, deviceAPI);
return gui;
@ -334,7 +334,7 @@ void DSDDemodGUI::onMenuDoubleClicked()
}
}
DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::DSDDemodGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/demoddsd/dsddemodgui.h
Wyświetl plik

@ -25,7 +25,7 @@
#include "dsp/movingaverage.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
@ -40,7 +40,7 @@ class DSDDemodGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static DSDDemodGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static DSDDemodGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -90,7 +90,7 @@ private:
Ui::DSDDemodGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
@ -121,7 +121,7 @@ private:
static const char *m_ysfCallModeText[4];
explicit DSDDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit DSDDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~DSDDemodGUI();
void blockApplySettings(bool block);

7
plugins/channelrx/demoddsd/dsddemodplugin.cpp
Wyświetl plik

@ -17,10 +17,9 @@
#include "../../channelrx/demoddsd/dsddemodplugin.h"
#include <device/devicesourceapi.h>
#include <QtPlugin>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "../../channelrx/demoddsd/dsddemodgui.h"
const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = {
@ -50,7 +49,7 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(DSDDemodGUI::m_channelID, this);
}
PluginGUI* DSDDemodPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* DSDDemodPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == DSDDemodGUI::m_channelID)
{
@ -61,7 +60,7 @@ PluginGUI* DSDDemodPlugin::createChannel(const QString& channelName, DeviceAPI *
}
}
void DSDDemodPlugin::createInstanceDSDDemod(DeviceAPI *deviceAPI)
void DSDDemodPlugin::createInstanceDSDDemod(DeviceSourceAPI *deviceAPI)
{
DSDDemodGUI* gui = DSDDemodGUI::create(m_pluginAPI, deviceAPI);
}

6
plugins/channelrx/demoddsd/dsddemodplugin.h
Wyświetl plik

@ -21,7 +21,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class DSDDemodPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -34,7 +34,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -42,7 +42,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceDSDDemod(DeviceAPI *deviceAPI);
void createInstanceDSDDemod(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_DSDDEMODLUGIN_H

6
plugins/channelrx/demodlora/lorademodgui.cpp
Wyświetl plik

@ -1,6 +1,7 @@
#include "../../channelrx/demodlora/lorademodgui.h"
#include "../../channelrx/demodlora/lorademodgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
@ -11,7 +12,6 @@
#include "dsp/spectrumvis.h"
#include "gui/glspectrum.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "gui/basicchannelsettingswidget.h"
#include "dsp/dspengine.h"
@ -19,7 +19,7 @@
const QString LoRaDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.lora";
LoRaDemodGUI* LoRaDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
LoRaDemodGUI* LoRaDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
LoRaDemodGUI* gui = new LoRaDemodGUI(pluginAPI, deviceAPI);
return gui;
@ -151,7 +151,7 @@ void LoRaDemodGUI::onMenuDoubleClicked()
}
}
LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::LoRaDemodGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/demodlora/lorademodgui.h
Wyświetl plik

@ -8,7 +8,7 @@
#define BANDWIDTHSTRING {7813,15625,20833,31250,62500}
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
class LoRaDemod;
@ -22,7 +22,7 @@ class LoRaDemodGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static LoRaDemodGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static LoRaDemodGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -48,7 +48,7 @@ private slots:
private:
Ui::LoRaDemodGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
@ -58,7 +58,7 @@ private:
LoRaDemod* m_LoRaDemod;
SpectrumVis* m_spectrumVis;
explicit LoRaDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit LoRaDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~LoRaDemodGUI();
void blockApplySettings(bool block);

4
plugins/channelrx/demodlora/loraplugin.cpp
Wyświetl plik

@ -32,7 +32,7 @@ void LoRaPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(LoRaDemodGUI::m_channelID, this);
}
PluginGUI* LoRaPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* LoRaPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == LoRaDemodGUI::m_channelID)
{
@ -43,7 +43,7 @@ PluginGUI* LoRaPlugin::createChannel(const QString& channelName, DeviceAPI *devi
}
}
void LoRaPlugin::createInstanceLoRa(DeviceAPI *deviceAPI)
void LoRaPlugin::createInstanceLoRa(DeviceSourceAPI *deviceAPI)
{
LoRaDemodGUI* gui = LoRaDemodGUI::create(m_pluginAPI, deviceAPI);
}

6
plugins/channelrx/demodlora/loraplugin.h
Wyświetl plik

@ -4,7 +4,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class LoRaPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -25,7 +25,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceLoRa(DeviceAPI *deviceAPI);
void createInstanceLoRa(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_LoRaPLUGIN_H

6
plugins/channelrx/demodnfm/nfmdemodgui.cpp
Wyświetl plik

@ -1,5 +1,6 @@
#include "../../channelrx/demodnfm/nfmdemodgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
@ -9,7 +10,6 @@
#include "ui_nfmdemodgui.h"
#include "dsp/nullsink.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingswidget.h"
@ -27,7 +27,7 @@ const int NFMDemodGUI::m_fmDev[] = { // corresponding FM deviations
};
const int NFMDemodGUI::m_nbRfBW = 9;
NFMDemodGUI* NFMDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
NFMDemodGUI* NFMDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
NFMDemodGUI* gui = new NFMDemodGUI(pluginAPI, deviceAPI);
return gui;
@ -252,7 +252,7 @@ void NFMDemodGUI::onMenuDoubleClicked()
}
}
NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::NFMDemodGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/demodnfm/nfmdemodgui.h
Wyświetl plik

@ -8,7 +8,7 @@
#include "dsp/movingaverage.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
@ -22,7 +22,7 @@ class NFMDemodGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static NFMDemodGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static NFMDemodGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -58,7 +58,7 @@ private slots:
private:
Ui::NFMDemodGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
@ -75,7 +75,7 @@ private:
static const int m_fmDev[];
static const int m_nbRfBW;
explicit NFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit NFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~NFMDemodGUI();
void blockApplySettings(bool block);

4
plugins/channelrx/demodnfm/nfmplugin.cpp
Wyświetl plik

@ -32,7 +32,7 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(NFMDemodGUI::m_channelID, this);
}
PluginGUI* NFMPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* NFMPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == NFMDemodGUI::m_channelID) {
NFMDemodGUI* gui = NFMDemodGUI::create(m_pluginAPI, deviceAPI);
@ -42,7 +42,7 @@ PluginGUI* NFMPlugin::createChannel(const QString& channelName, DeviceAPI *devic
}
}
void NFMPlugin::createInstanceNFM(DeviceAPI *deviceAPI)
void NFMPlugin::createInstanceNFM(DeviceSourceAPI *deviceAPI)
{
NFMDemodGUI* gui = NFMDemodGUI::create(m_pluginAPI, deviceAPI);
}

6
plugins/channelrx/demodnfm/nfmplugin.h
Wyświetl plik

@ -4,7 +4,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class NFMPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -25,7 +25,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceNFM(DeviceAPI *deviceAPI);
void createInstanceNFM(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_NFMPLUGIN_H

6
plugins/channelrx/demodssb/ssbdemodgui.cpp
Wyświetl plik

@ -1,6 +1,7 @@
#include "../../channelrx/demodssb/ssbdemodgui.h"
#include "../../channelrx/demodssb/ssbdemodgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
@ -11,7 +12,6 @@
#include "dsp/spectrumvis.h"
#include "gui/glspectrum.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingswidget.h"
@ -21,7 +21,7 @@
const QString SSBDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.ssb";
SSBDemodGUI* SSBDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
SSBDemodGUI* SSBDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
SSBDemodGUI* gui = new SSBDemodGUI(pluginAPI, deviceAPI);
return gui;
@ -319,7 +319,7 @@ void SSBDemodGUI::onMenuDoubleClicked()
}
}
SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::SSBDemodGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/demodssb/ssbdemodgui.h
Wyświetl plik

@ -7,7 +7,7 @@
#include "dsp/movingaverage.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class AudioFifo;
class ThreadedBasebandSampleSink;
@ -23,7 +23,7 @@ class SSBDemodGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static SSBDemodGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static SSBDemodGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -58,7 +58,7 @@ private slots:
private:
Ui::SSBDemodGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
@ -75,7 +75,7 @@ private:
SSBDemod* m_ssbDemod;
SpectrumVis* m_spectrumVis;
explicit SSBDemodGUI(PluginAPI* pluginAPI, DeviceAPI* deviceAPI, QWidget* parent = NULL);
explicit SSBDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI* deviceAPI, QWidget* parent = NULL);
virtual ~SSBDemodGUI();
int getEffectiveLowCutoff(int lowCutoff);

7
plugins/channelrx/demodssb/ssbplugin.cpp
Wyświetl plik

@ -1,9 +1,8 @@
#include "../../channelrx/demodssb/ssbplugin.h"
#include <device/devicesourceapi.h>
#include <QtPlugin>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "../../channelrx/demodssb/ssbdemodgui.h"
const PluginDescriptor SSBPlugin::m_pluginDescriptor = {
@ -33,7 +32,7 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(SSBDemodGUI::m_channelID, this);
}
PluginGUI* SSBPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* SSBPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == SSBDemodGUI::m_channelID)
{
@ -44,7 +43,7 @@ PluginGUI* SSBPlugin::createChannel(const QString& channelName, DeviceAPI *devic
}
}
void SSBPlugin::createInstanceSSB(DeviceAPI *deviceAPI)
void SSBPlugin::createInstanceSSB(DeviceSourceAPI *deviceAPI)
{
SSBDemodGUI* gui = SSBDemodGUI::create(m_pluginAPI, deviceAPI);
}

6
plugins/channelrx/demodssb/ssbplugin.h
Wyświetl plik

@ -4,7 +4,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class SSBPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -25,7 +25,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceSSB(DeviceAPI *deviceAPI);
void createInstanceSSB(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_SSBPLUGIN_H

6
plugins/channelrx/demodwfm/wfmdemodgui.cpp
Wyświetl plik

@ -1,5 +1,6 @@
#include "../../channelrx/demodwfm/wfmdemodgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
@ -9,7 +10,6 @@
#include "ui_wfmdemodgui.h"
#include "dsp/dspengine.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingswidget.h"
@ -33,7 +33,7 @@ int requiredBW(int rfBW)
return 384000;
}
WFMDemodGUI* WFMDemodGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
WFMDemodGUI* WFMDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
WFMDemodGUI* gui = new WFMDemodGUI(pluginAPI, deviceAPI);
return gui;
@ -218,7 +218,7 @@ void WFMDemodGUI::onMenuDoubleClicked()
}
}
WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::WFMDemodGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/demodwfm/wfmdemodgui.h
Wyświetl plik

@ -7,7 +7,7 @@
#include "dsp/movingaverage.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
@ -21,7 +21,7 @@ class WFMDemodGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static WFMDemodGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static WFMDemodGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -52,7 +52,7 @@ private slots:
private:
Ui::WFMDemodGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
@ -64,7 +64,7 @@ private:
static const int m_rfBW[];
explicit WFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit WFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~WFMDemodGUI();
void blockApplySettings(bool block);

4
plugins/channelrx/demodwfm/wfmplugin.cpp
Wyświetl plik

@ -32,7 +32,7 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(WFMDemodGUI::m_channelID, this);
}
PluginGUI* WFMPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* WFMPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == WFMDemodGUI::m_channelID)
{
@ -43,7 +43,7 @@ PluginGUI* WFMPlugin::createChannel(const QString& channelName, DeviceAPI *devic
}
}
void WFMPlugin::createInstanceWFM(DeviceAPI *deviceAPI)
void WFMPlugin::createInstanceWFM(DeviceSourceAPI *deviceAPI)
{
WFMDemodGUI* gui = WFMDemodGUI::create(m_pluginAPI, deviceAPI);
}

6
plugins/channelrx/demodwfm/wfmplugin.h
Wyświetl plik

@ -4,7 +4,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class WFMPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -25,7 +25,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceWFM(DeviceAPI *deviceAPI);
void createInstanceWFM(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_WFMPLUGIN_H

6
plugins/channelrx/tcpsrc/tcpsrcgui.cpp
Wyświetl plik

@ -1,9 +1,9 @@
#include "../../channelrx/tcpsrc/tcpsrcgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include "../../../sdrbase/dsp/threadedbasebandsamplesink.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "dsp/spectrumvis.h"
#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
@ -15,7 +15,7 @@
const QString TCPSrcGUI::m_channelID = "sdrangel.channel.tcpsrc";
TCPSrcGUI* TCPSrcGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
TCPSrcGUI* TCPSrcGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
TCPSrcGUI* gui = new TCPSrcGUI(pluginAPI, deviceAPI);
return gui;
@ -183,7 +183,7 @@ void TCPSrcGUI::tick()
ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1));
}
TCPSrcGUI::TCPSrcGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
TCPSrcGUI::TCPSrcGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::TCPSrcGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/tcpsrc/tcpsrcgui.h
Wyświetl plik

@ -10,7 +10,7 @@
#include "../../channelrx/tcpsrc/tcpsrc.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
class TCPSrc;
@ -24,7 +24,7 @@ class TCPSrcGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static TCPSrcGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static TCPSrcGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -57,7 +57,7 @@ private slots:
private:
Ui::TCPSrcGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
TCPSrc* m_tcpSrc;
ChannelMarker m_channelMarker;
MovingAverage<Real> m_channelPowerDbAvg;
@ -76,7 +76,7 @@ private:
DownChannelizer* m_channelizer;
SpectrumVis* m_spectrumVis;
explicit TCPSrcGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = 0);
explicit TCPSrcGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = 0);
virtual ~TCPSrcGUI();
void blockApplySettings(bool block);

4
plugins/channelrx/tcpsrc/tcpsrcplugin.cpp
Wyświetl plik

@ -32,7 +32,7 @@ void TCPSrcPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(TCPSrcGUI::m_channelID, this);
}
PluginGUI* TCPSrcPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* TCPSrcPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == TCPSrcGUI::m_channelID)
{
@ -45,7 +45,7 @@ PluginGUI* TCPSrcPlugin::createChannel(const QString& channelName, DeviceAPI *de
}
}
void TCPSrcPlugin::createInstanceTCPSrc(DeviceAPI *deviceAPI)
void TCPSrcPlugin::createInstanceTCPSrc(DeviceSourceAPI *deviceAPI)
{
TCPSrcGUI* gui = TCPSrcGUI::create(m_pluginAPI, deviceAPI);
// deviceAPI->registerChannelInstance("sdrangel.channel.tcpsrc", gui);

6
plugins/channelrx/tcpsrc/tcpsrcplugin.h
Wyświetl plik

@ -4,7 +4,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class TCPSrcPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -17,7 +17,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -25,7 +25,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceTCPSrc(DeviceAPI *deviceAPI);
void createInstanceTCPSrc(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_TCPSRCPLUGIN_H

6
plugins/channelrx/udpsrc/udpsrcgui.cpp
Wyświetl plik

@ -17,10 +17,10 @@
#include "../../channelrx/udpsrc/udpsrcgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>
#include "../../../sdrbase/dsp/threadedbasebandsamplesink.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "dsp/spectrumvis.h"
#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
@ -33,7 +33,7 @@
const QString UDPSrcGUI::m_channelID = "sdrangel.channel.udpsrc";
UDPSrcGUI* UDPSrcGUI::create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI)
UDPSrcGUI* UDPSrcGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI)
{
UDPSrcGUI* gui = new UDPSrcGUI(pluginAPI, deviceAPI);
return gui;
@ -220,7 +220,7 @@ void UDPSrcGUI::tick()
ui->channelPower->setText(QString::number(m_channelPowerDbAvg.average(), 'f', 1));
}
UDPSrcGUI::UDPSrcGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent) :
UDPSrcGUI::UDPSrcGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::UDPSrcGUI),
m_pluginAPI(pluginAPI),

8
plugins/channelrx/udpsrc/udpsrcgui.h
Wyświetl plik

@ -27,7 +27,7 @@
#include "../../channelrx/udpsrc/udpsrc.h"
class PluginAPI;
class DeviceAPI;
class DeviceSourceAPI;
class ThreadedBasebandSampleSink;
class DownChannelizer;
class UDPSrc;
@ -41,7 +41,7 @@ class UDPSrcGUI : public RollupWidget, public PluginGUI {
Q_OBJECT
public:
static UDPSrcGUI* create(PluginAPI* pluginAPI, DeviceAPI *deviceAPI);
static UDPSrcGUI* create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI);
void destroy();
void setName(const QString& name);
@ -80,7 +80,7 @@ private slots:
private:
Ui::UDPSrcGUI* ui;
PluginAPI* m_pluginAPI;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
UDPSrc* m_udpSrc;
ChannelMarker m_channelMarker;
MovingAverage<Real> m_channelPowerDbAvg;
@ -105,7 +105,7 @@ private:
DownChannelizer* m_channelizer;
SpectrumVis* m_spectrumVis;
explicit UDPSrcGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = 0);
explicit UDPSrcGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = 0);
virtual ~UDPSrcGUI();
void blockApplySettings(bool block);

4
plugins/channelrx/udpsrc/udpsrcplugin.cpp
Wyświetl plik

@ -49,7 +49,7 @@ void UDPSrcPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI->registerChannel(UDPSrcGUI::m_channelID, this);
}
PluginGUI* UDPSrcPlugin::createChannel(const QString& channelName, DeviceAPI *deviceAPI)
PluginGUI* UDPSrcPlugin::createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI)
{
if(channelName == UDPSrcGUI::m_channelID)
{
@ -62,7 +62,7 @@ PluginGUI* UDPSrcPlugin::createChannel(const QString& channelName, DeviceAPI *de
}
}
void UDPSrcPlugin::createInstanceUDPSrc(DeviceAPI *deviceAPI)
void UDPSrcPlugin::createInstanceUDPSrc(DeviceSourceAPI *deviceAPI)
{
UDPSrcGUI* gui = UDPSrcGUI::create(m_pluginAPI, deviceAPI);
// deviceAPI->registerChannelInstance("sdrangel.channel.udpsrc", gui);

6
plugins/channelrx/udpsrc/udpsrcplugin.h
Wyświetl plik

@ -21,7 +21,7 @@
#include <QObject>
#include "plugin/plugininterface.h"
class DeviceAPI;
class DeviceSourceAPI;
class UDPSrcPlugin : public QObject, PluginInterface {
Q_OBJECT
@ -34,7 +34,7 @@ public:
const PluginDescriptor& getPluginDescriptor() const;
void initPlugin(PluginAPI* pluginAPI);
PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI);
PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI);
private:
static const PluginDescriptor m_pluginDescriptor;
@ -42,7 +42,7 @@ private:
PluginAPI* m_pluginAPI;
private slots:
void createInstanceUDPSrc(DeviceAPI *deviceAPI);
void createInstanceUDPSrc(DeviceSourceAPI *deviceAPI);
};
#endif // INCLUDE_UDPSRCPLUGIN_H

4
plugins/samplesource/airspy/airspygui.cpp
Wyświetl plik

@ -21,16 +21,16 @@
#include "airspygui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
#include "ui_airspygui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
AirspyGui::AirspyGui(DeviceAPI *deviceAPI, QWidget* parent) :
AirspyGui::AirspyGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::AirspyGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/airspy/airspygui.h
Wyświetl plik

@ -24,7 +24,7 @@
#define AIRSPY_MAX_DEVICE (32)
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
namespace Ui {
@ -36,7 +36,7 @@ class AirspyGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit AirspyGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit AirspyGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~AirspyGui();
void destroy();
@ -55,7 +55,7 @@ public:
private:
Ui::AirspyGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
AirspySettings m_settings;
QTimer m_updateTimer;
QTimer m_statusTimer;

5
plugins/samplesource/airspy/airspyinput.cpp
Wyświetl plik

@ -20,7 +20,8 @@
#include "airspygui.h"
#include "airspyinput.h"
#include "device/deviceapi.h"
#include <device/devicesourceapi.h>
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "airspysettings.h"
@ -29,7 +30,7 @@
MESSAGE_CLASS_DEFINITION(AirspyInput::MsgConfigureAirspy, Message)
MESSAGE_CLASS_DEFINITION(AirspyInput::MsgReportAirspy, Message)
AirspyInput::AirspyInput(DeviceAPI *deviceAPI) :
AirspyInput::AirspyInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_settings(),
m_dev(0),

6
plugins/samplesource/airspy/airspyinput.h
Wyświetl plik

@ -23,7 +23,7 @@
#include <libairspy/airspy.h>
#include <QString>
class DeviceAPI;
class DeviceSourceAPI;
class AirspyThread;
class AirspyInput : public DeviceSampleSource {
@ -68,7 +68,7 @@ public:
{ }
};
AirspyInput(DeviceAPI *deviceAPI);
AirspyInput(DeviceSourceAPI *deviceAPI);
virtual ~AirspyInput();
virtual bool init(const Message& message);
@ -87,7 +87,7 @@ private:
struct airspy_device *open_airspy_from_sequence(int sequence);
void setCenterFrequency(quint64 freq);
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex;
AirspySettings m_settings;
struct airspy_device* m_dev;

5
plugins/samplesource/airspy/airspyplugin.cpp
Wyświetl plik

@ -20,8 +20,9 @@
#include "airspygui.h"
#include "airspyplugin.h"
#include <device/devicesourceapi.h>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
const PluginDescriptor AirspyPlugin::m_pluginDescriptor = {
@ -116,7 +117,7 @@ PluginInterface::SampleSourceDevices AirspyPlugin::enumSampleSources()
return result;
}
PluginGUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* AirspyPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if (sourceId == m_deviceTypeID)
{

2
plugins/samplesource/airspy/airspyplugin.h
Wyświetl plik

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

5
plugins/samplesource/bladerf/bladerfgui.cpp
Wyświetl plik

@ -20,15 +20,16 @@
#include <libbladeRF.h>
#include "ui_bladerfgui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "bladerfgui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
BladerfGui::BladerfGui(DeviceAPI *deviceAPI, QWidget* parent) :
BladerfGui::BladerfGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::BladerfGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/bladerf/bladerfgui.h
Wyświetl plik

@ -22,7 +22,7 @@
#include "bladerfinput.h"
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
namespace Ui {
@ -34,7 +34,7 @@ class BladerfGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit BladerfGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit BladerfGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~BladerfGui();
void destroy();
@ -51,7 +51,7 @@ public:
private:
Ui::BladerfGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
BladeRFSettings m_settings;
QTimer m_updateTimer;
QTimer m_statusTimer;

6
plugins/samplesource/bladerf/bladerfinput.cpp
Wyświetl plik

@ -18,18 +18,20 @@
#include <errno.h>
#include <QDebug>
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "bladerfgui.h"
#include "bladerfinput.h"
#include <device/devicesourceapi.h>
#include "bladerfthread.h"
MESSAGE_CLASS_DEFINITION(BladerfInput::MsgConfigureBladerf, Message)
MESSAGE_CLASS_DEFINITION(BladerfInput::MsgReportBladerf, Message)
BladerfInput::BladerfInput(DeviceAPI *deviceAPI) :
BladerfInput::BladerfInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_settings(),
m_dev(0),

6
plugins/samplesource/bladerf/bladerfinput.h
Wyświetl plik

@ -23,7 +23,7 @@
#include <libbladeRF.h>
#include <QString>
class DeviceAPI;
class DeviceSourceAPI;
class BladerfThread;
class BladerfInput : public DeviceSampleSource {
@ -65,7 +65,7 @@ public:
{ }
};
BladerfInput(DeviceAPI *deviceAPI);
BladerfInput(DeviceSourceAPI *deviceAPI);
virtual ~BladerfInput();
virtual bool init(const Message& message);
@ -83,7 +83,7 @@ private:
bladerf_lna_gain getLnaGain(int lnaGain);
struct bladerf *open_bladerf_from_serial(const char *serial);
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex;
BladeRFSettings m_settings;
struct bladerf* m_dev;

4
plugins/samplesource/bladerf/bladerfplugin.cpp
Wyświetl plik

@ -18,10 +18,10 @@
#include <QAction>
#include <libbladeRF.h>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "bladerfgui.h"
#include "bladerfplugin.h"
#include <device/devicesourceapi.h>
const PluginDescriptor BlderfPlugin::m_pluginDescriptor = {
QString("BladerRF Input"),
@ -74,7 +74,7 @@ PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources()
return result;
}
PluginGUI* BlderfPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* BlderfPlugin::createSampleSourcePluginGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/bladerf/bladerfplugin.h
Wyświetl plik

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

4
plugins/samplesource/fcdpro/fcdprogui.cpp
Wyświetl plik

@ -17,17 +17,17 @@
#include <QMessageBox>
#include "ui_fcdprogui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "fcdprogui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
#include "fcdproconst.h"
FCDProGui::FCDProGui(DeviceAPI *deviceAPI, QWidget* parent) :
FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::FCDProGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/fcdpro/fcdprogui.h
Wyświetl plik

@ -22,7 +22,7 @@
#include "fcdproinput.h"
#include "plugin/plugingui.h"
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
class QWidget;
@ -34,7 +34,7 @@ class FCDProGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit FCDProGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~FCDProGui();
void destroy();
@ -52,7 +52,7 @@ public:
private:
Ui::FCDProGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
FCDProSettings m_settings;
QTimer m_updateTimer;
QTimer m_statusTimer;

5
plugins/samplesource/fcdpro/fcdproinput.cpp
Wyświetl plik

@ -21,11 +21,12 @@
#include <string.h>
#include <errno.h>
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "fcdproinput.h"
#include <device/devicesourceapi.h>
#include "fcdprogui.h"
#include "fcdprothread.h"
#include "fcdtraits.h"
@ -33,7 +34,7 @@
MESSAGE_CLASS_DEFINITION(FCDProInput::MsgConfigureFCD, Message)
FCDProInput::FCDProInput(DeviceAPI *deviceAPI) :
FCDProInput::FCDProInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_dev(0),
m_settings(),

6
plugins/samplesource/fcdpro/fcdproinput.h
Wyświetl plik

@ -30,7 +30,7 @@ struct fcd_buffer {
std::size_t length;
};
class DeviceAPI;
class DeviceSourceAPI;
class FCDProThread;
class FCDProInput : public DeviceSampleSource {
@ -55,7 +55,7 @@ public:
{ }
};
FCDProInput(DeviceAPI *deviceAPI);
FCDProInput(DeviceSourceAPI *deviceAPI);
virtual ~FCDProInput();
virtual bool init(const Message& cmd);
@ -91,7 +91,7 @@ private:
void applySettings(const FCDProSettings& settings, bool force);
void set_lo_ppm();
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
hid_device *m_dev;
QMutex m_mutex;
FCDProSettings m_settings;

6
plugins/samplesource/fcdpro/fcdproplugin.cpp
Wyświetl plik

@ -17,9 +17,11 @@
#include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "fcdproplugin.h"
#include <device/devicesourceapi.h>
#include "fcdprogui.h"
#include "fcdtraits.h"
@ -73,7 +75,7 @@ PluginInterface::SampleSourceDevices FCDProPlugin::enumSampleSources()
return result;
}
PluginGUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* FCDProPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == fcd_traits<Pro>::interfaceIID)
{

2
plugins/samplesource/fcdpro/fcdproplugin.h
Wyświetl plik

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

4
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
Wyświetl plik

@ -18,17 +18,17 @@
#include <QMessageBox>
#include "ui_fcdproplusgui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "fcdproplusgui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
#include "fcdproplusconst.h"
FCDProPlusGui::FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent) :
FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::FCDProPlusGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/fcdproplus/fcdproplusgui.h
Wyświetl plik

@ -22,7 +22,7 @@
#include "fcdproplusinput.h"
#include "plugin/plugingui.h"
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
namespace Ui {
@ -33,7 +33,7 @@ class FCDProPlusGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~FCDProPlusGui();
void destroy();
@ -51,7 +51,7 @@ public:
private:
Ui::FCDProPlusGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
FCDProPlusSettings m_settings;
QTimer m_updateTimer;
QTimer m_statusTimer;

5
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
Wyświetl plik

@ -20,11 +20,12 @@
#include <string.h>
#include <errno.h>
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "fcdproplusinput.h"
#include <device/devicesourceapi.h>
#include "fcdproplusgui.h"
#include "fcdproplusthread.h"
#include "fcdtraits.h"
@ -32,7 +33,7 @@
MESSAGE_CLASS_DEFINITION(FCDProPlusInput::MsgConfigureFCD, Message)
FCDProPlusInput::FCDProPlusInput(DeviceAPI *deviceAPI) :
FCDProPlusInput::FCDProPlusInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_dev(0),
m_settings(),

6
plugins/samplesource/fcdproplus/fcdproplusinput.h
Wyświetl plik

@ -29,7 +29,7 @@ struct fcd_buffer {
std::size_t length;
};
class DeviceAPI;
class DeviceSourceAPI;
class FCDProPlusThread;
class FCDProPlusInput : public DeviceSampleSource {
@ -54,7 +54,7 @@ public:
{ }
};
FCDProPlusInput(DeviceAPI *deviceAPI);
FCDProPlusInput(DeviceSourceAPI *deviceAPI);
virtual ~FCDProPlusInput();
virtual bool init(const Message& cmd);
@ -79,7 +79,7 @@ public:
private:
void applySettings(const FCDProPlusSettings& settings, bool force);
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
hid_device *m_dev;
QMutex m_mutex;
FCDProPlusSettings m_settings;

6
plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
Wyświetl plik

@ -17,9 +17,11 @@
#include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "fcdproplusplugin.h"
#include <device/devicesourceapi.h>
#include "fcdproplusgui.h"
#include "fcdtraits.h"
@ -73,7 +75,7 @@ PluginInterface::SampleSourceDevices FCDProPlusPlugin::enumSampleSources()
return result;
}
PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* FCDProPlusPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == fcd_traits<ProPlus>::interfaceIID)
{

2
plugins/samplesource/fcdproplus/fcdproplusplugin.h
Wyświetl plik

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

4
plugins/samplesource/filesource/filesourcegui.cpp
Wyświetl plik

@ -24,7 +24,6 @@
#include "ui_filesourcegui.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
@ -33,8 +32,9 @@
#include "mainwindow.h"
#include "filesourcegui.h"
#include <device/devicesourceapi.h>
FileSourceGui::FileSourceGui(DeviceAPI *deviceAPI, QWidget* parent) :
FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::FileSourceGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/filesource/filesourcegui.h
Wyświetl plik

@ -22,7 +22,7 @@
#include "filesourceinput.h"
class DeviceAPI;
class DeviceSourceAPI;
namespace Ui {
class FileSourceGui;
@ -32,7 +32,7 @@ class FileSourceGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit FileSourceGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~FileSourceGui();
void destroy();
@ -49,7 +49,7 @@ public:
private:
Ui::FileSourceGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
FileSourceInput::Settings m_settings;
QTimer m_statusTimer;
std::vector<int> m_gains;

4
plugins/samplesource/filesource/filesourceplugin.cpp
Wyświetl plik

@ -17,11 +17,11 @@
#include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "filesourcegui.h"
#include "filesourceplugin.h"
#include <device/devicesourceapi.h>
const PluginDescriptor FileSourcePlugin::m_pluginDescriptor = {
QString("File source input"),
@ -67,7 +67,7 @@ PluginInterface::SampleSourceDevices FileSourcePlugin::enumSampleSources()
return result;
}
PluginGUI* FileSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* FileSourcePlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/filesource/filesourceplugin.h
Wyświetl plik

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

4
plugins/samplesource/hackrf/hackrfgui.cpp
Wyświetl plik

@ -19,18 +19,18 @@
#include <libhackrf/hackrf.h>
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "hackrfgui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
#include "ui_hackrfgui.h"
HackRFGui::HackRFGui(DeviceAPI *deviceAPI, QWidget* parent) :
HackRFGui::HackRFGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::HackRFGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/hackrf/hackrfgui.h
Wyświetl plik

@ -24,7 +24,7 @@
#define HACKRF_MAX_DEVICE (32)
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
namespace Ui {
@ -43,7 +43,7 @@ public:
HACKRF_IMGREJ_NB
} HackRFImgRejValue;
explicit HackRFGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit HackRFGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~HackRFGui();
void destroy();
@ -60,7 +60,7 @@ public:
private:
Ui::HackRFGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
HackRFSettings m_settings;
QTimer m_updateTimer;
QTimer m_statusTimer;

5
plugins/samplesource/hackrf/hackrfinput.cpp
Wyświetl plik

@ -18,19 +18,20 @@
#include <errno.h>
#include <QDebug>
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "hackrfinput.h"
#include <device/devicesourceapi.h>
#include "hackrfgui.h"
#include "hackrfthread.h"
MESSAGE_CLASS_DEFINITION(HackRFInput::MsgConfigureHackRF, Message)
MESSAGE_CLASS_DEFINITION(HackRFInput::MsgReportHackRF, Message)
HackRFInput::HackRFInput(DeviceAPI *deviceAPI) :
HackRFInput::HackRFInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_settings(),
m_dev(0),

6
plugins/samplesource/hackrf/hackrfinput.h
Wyświetl plik

@ -22,7 +22,7 @@
#include "hackrfsettings.h"
#include <QString>
class DeviceAPI;
class DeviceSourceAPI;
class HackRFThread;
class HackRFInput : public DeviceSampleSource {
@ -65,7 +65,7 @@ public:
{ }
};
HackRFInput(DeviceAPI *deviceAPI);
HackRFInput(DeviceSourceAPI *deviceAPI);
virtual ~HackRFInput();
virtual bool init(const Message& message);
@ -83,7 +83,7 @@ private:
hackrf_device *open_hackrf_from_sequence(int sequence);
void setCenterFrequency(quint64 freq);
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex;
HackRFSettings m_settings;
struct hackrf_device* m_dev;

5
plugins/samplesource/hackrf/hackrfplugin.cpp
Wyświetl plik

@ -20,9 +20,10 @@
#include "hackrfplugin.h"
#include <device/devicesourceapi.h>
#include "hackrfgui.h"
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
const PluginDescriptor HackRFPlugin::m_pluginDescriptor = {
@ -111,7 +112,7 @@ PluginInterface::SampleSourceDevices HackRFPlugin::enumSampleSources()
return result;
}
PluginGUI* HackRFPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* HackRFPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/hackrf/hackrfplugin.h
Wyświetl plik

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

4
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
Wyświetl plik

@ -19,16 +19,16 @@
#include "rtlsdrgui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
#include "ui_rtlsdrgui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
RTLSDRGui::RTLSDRGui(DeviceAPI *deviceAPI, QWidget* parent) :
RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::RTLSDRGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/rtlsdr/rtlsdrgui.h
Wyświetl plik

@ -21,7 +21,7 @@
#include "plugin/plugingui.h"
#include "rtlsdrinput.h"
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
namespace Ui {
@ -33,7 +33,7 @@ class RTLSDRGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit RTLSDRGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~RTLSDRGui();
void destroy();
@ -50,7 +50,7 @@ public:
private:
Ui::RTLSDRGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
RTLSDRSettings m_settings;
QTimer m_updateTimer;
QTimer m_statusTimer;

6
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
Wyświetl plik

@ -19,16 +19,18 @@
#include <string.h>
#include <errno.h>
#include "rtlsdrinput.h"
#include <device/devicesourceapi.h>
#include "rtlsdrthread.h"
#include "rtlsdrgui.h"
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgConfigureRTLSDR, Message)
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgReportRTLSDR, Message)
RTLSDRInput::RTLSDRInput(DeviceAPI *deviceAPI) :
RTLSDRInput::RTLSDRInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_settings(),
m_dev(0),

6
plugins/samplesource/rtlsdr/rtlsdrinput.h
Wyświetl plik

@ -24,7 +24,7 @@
#include <rtl-sdr.h>
#include <QString>
class DeviceAPI;
class DeviceSourceAPI;
class RTLSDRThread;
class RTLSDRInput : public DeviceSampleSource {
@ -69,7 +69,7 @@ public:
{ }
};
RTLSDRInput(DeviceAPI *deviceAPI);
RTLSDRInput(DeviceSourceAPI *deviceAPI);
virtual ~RTLSDRInput();
virtual bool init(const Message& message);
@ -85,7 +85,7 @@ public:
void set_ds_mode(int on);
private:
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex;
RTLSDRSettings m_settings;
rtlsdr_dev_t* m_dev;

6
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
Wyświetl plik

@ -2,9 +2,11 @@
#include <QAction>
#include <rtl-sdr.h>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "rtlsdrplugin.h"
#include <device/devicesourceapi.h>
#include "rtlsdrgui.h"
const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
@ -58,7 +60,7 @@ PluginInterface::SampleSourceDevices RTLSDRPlugin::enumSampleSources()
return result;
}
PluginGUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* RTLSDRPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID) {
RTLSDRGui* gui = new RTLSDRGui(deviceAPI);

2
plugins/samplesource/rtlsdr/rtlsdrplugin.h
Wyświetl plik

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

5
plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
Wyświetl plik

@ -30,7 +30,6 @@
#include <nanomsg/pair.h>
#include "ui_sdrdaemongui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
@ -39,9 +38,11 @@
#include "util/simpleserializer.h"
#include "sdrdaemongui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
SDRdaemonGui::SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent) :
SDRdaemonGui::SDRdaemonGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::SDRdaemonGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/sdrdaemon/sdrdaemongui.h
Wyświetl plik

@ -23,7 +23,7 @@
#include "sdrdaemoninput.h"
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
namespace Ui {
@ -34,7 +34,7 @@ class SDRdaemonGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit SDRdaemonGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~SDRdaemonGui();
void destroy();
@ -51,7 +51,7 @@ public:
private:
Ui::SDRdaemonGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
QTimer m_updateTimer;
QTimer m_statusTimer;
DeviceSampleSource* m_sampleSource;

4
plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp
Wyświetl plik

@ -18,13 +18,13 @@
#include <errno.h>
#include <QDebug>
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "sdrdaemongui.h"
#include "sdrdaemoninput.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
#include "sdrdaemonudphandler.h"
@ -39,7 +39,7 @@ MESSAGE_CLASS_DEFINITION(SDRdaemonInput::MsgReportSDRdaemonAcquisition, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonInput::MsgReportSDRdaemonStreamData, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonInput::MsgReportSDRdaemonStreamTiming, Message)
SDRdaemonInput::SDRdaemonInput(const QTimer& masterTimer, DeviceAPI *deviceAPI) :
SDRdaemonInput::SDRdaemonInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_address("127.0.0.1"),
m_port(9090),

6
plugins/samplesource/sdrdaemon/sdrdaemoninput.h
Wyświetl plik

@ -24,7 +24,7 @@
#include <iostream>
#include <stdint.h>
class DeviceAPI;
class DeviceSourceAPI;
class SDRdaemonUDPHandler;
class SDRdaemonInput : public DeviceSampleSource {
@ -274,7 +274,7 @@ public:
{ }
};
SDRdaemonInput(const QTimer& masterTimer, DeviceAPI *deviceAPI);
SDRdaemonInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
virtual ~SDRdaemonInput();
virtual bool init(const Message& message);
@ -290,7 +290,7 @@ public:
virtual bool handleMessage(const Message& message);
private:
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex;
QString m_address;
quint16 m_port;

4
plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp
Wyświetl plik

@ -17,11 +17,11 @@
#include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "sdrdaemongui.h"
#include "sdrdaemonplugin.h"
#include <device/devicesourceapi.h>
const PluginDescriptor SDRdaemonPlugin::m_pluginDescriptor = {
QString("SDRdaemon input"),
@ -67,7 +67,7 @@ PluginInterface::SampleSourceDevices SDRdaemonPlugin::enumSampleSources()
return result;
}
PluginGUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* SDRdaemonPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/sdrdaemon/sdrdaemonplugin.h
Wyświetl plik

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

6
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp
Wyświetl plik

@ -19,13 +19,15 @@
#include <QTimer>
#include <unistd.h>
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "sdrdaemonudphandler.h"
#include <device/devicesourceapi.h>
#include "sdrdaemoninput.h"
SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *devieAPI) :
SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *devieAPI) :
m_deviceAPI(devieAPI),
m_sdrDaemonBuffer(m_rateDivider),
m_dataSocket(0),

6
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h
Wyświetl plik

@ -30,13 +30,13 @@
class SampleSinkFifo;
class MessageQueue;
class QTimer;
class DeviceAPI;
class DeviceSourceAPI;
class SDRdaemonUDPHandler : public QObject
{
Q_OBJECT
public:
SDRdaemonUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *deviceAPI);
SDRdaemonUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *deviceAPI);
~SDRdaemonUDPHandler();
void connectTimer(const QTimer* timer);
void start();
@ -50,7 +50,7 @@ public slots:
void dataReadyRead();
private:
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
SDRdaemonBuffer m_sdrDaemonBuffer;
QUdpSocket *m_dataSocket;
QHostAddress m_dataAddress;

5
plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp
Wyświetl plik

@ -30,7 +30,6 @@
#include <nanomsg/pair.h>
#include "ui_sdrdaemonfecgui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
@ -39,9 +38,11 @@
#include "util/simpleserializer.h"
#include "sdrdaemonfecgui.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
SDRdaemonFECGui::SDRdaemonFECGui(DeviceAPI *deviceAPI, QWidget* parent) :
SDRdaemonFECGui::SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::SDRdaemonFECGui),
m_deviceAPI(deviceAPI),

6
plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h
Wyświetl plik

@ -23,7 +23,7 @@
#include "sdrdaemonfecinput.h"
class DeviceAPI;
class DeviceSourceAPI;
class FileRecord;
namespace Ui {
@ -34,7 +34,7 @@ class SDRdaemonFECGui : public QWidget, public PluginGUI {
Q_OBJECT
public:
explicit SDRdaemonFECGui(DeviceAPI *deviceAPI, QWidget* parent = NULL);
explicit SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
virtual ~SDRdaemonFECGui();
void destroy();
@ -51,7 +51,7 @@ public:
private:
Ui::SDRdaemonFECGui* ui;
DeviceAPI* m_deviceAPI;
DeviceSourceAPI* m_deviceAPI;
QTimer m_updateTimer;
QTimer m_statusTimer;
DeviceSampleSource* m_sampleSource;

4
plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
Wyświetl plik

@ -18,12 +18,12 @@
#include <errno.h>
#include <QDebug>
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "sdrdaemonfecinput.h"
#include <device/devicesourceapi.h>
#include <dsp/filerecord.h>
#include "sdrdaemonfecgui.h"
@ -37,7 +37,7 @@ MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonAcquisition, Messa
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonFECStreamData, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonFECInput::MsgReportSDRdaemonFECStreamTiming, Message)
SDRdaemonFECInput::SDRdaemonFECInput(const QTimer& masterTimer, DeviceAPI *deviceAPI) :
SDRdaemonFECInput::SDRdaemonFECInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_address("127.0.0.1"),
m_port(9090),

6
plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h
Wyświetl plik

@ -24,7 +24,7 @@
#include <iostream>
#include <stdint.h>
class DeviceAPI;
class DeviceSourceAPI;
class SDRdaemonFECUDPHandler;
class SDRdaemonFECInput : public DeviceSampleSource {
@ -258,7 +258,7 @@ public:
{ }
};
SDRdaemonFECInput(const QTimer& masterTimer, DeviceAPI *deviceAPI);
SDRdaemonFECInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
virtual ~SDRdaemonFECInput();
virtual bool init(const Message& message);
@ -274,7 +274,7 @@ public:
virtual bool handleMessage(const Message& message);
private:
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex;
QString m_address;
quint16 m_port;

5
plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp
Wyświetl plik

@ -17,11 +17,12 @@
#include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "util/simpleserializer.h"
#include "sdrdaemonfecplugin.h"
#include <device/devicesourceapi.h>
#include "sdrdaemonfecgui.h"
const PluginDescriptor SDRdaemonFECPlugin::m_pluginDescriptor = {
@ -68,7 +69,7 @@ PluginInterface::SampleSourceDevices SDRdaemonFECPlugin::enumSampleSources()
return result;
}
PluginGUI* SDRdaemonFECPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI)
PluginGUI* SDRdaemonFECPlugin::createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
{
if(sourceId == m_deviceTypeID)
{

2
plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h
Wyświetl plik

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

4
plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp
Wyświetl plik

@ -19,13 +19,13 @@
#include <QTimer>
#include <unistd.h>
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "sdrdaemonfecinput.h"
#include "sdrdaemonfecudphandler.h"
#include <device/devicesourceapi.h>
SDRdaemonFECUDPHandler::SDRdaemonFECUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *devieAPI) :
SDRdaemonFECUDPHandler::SDRdaemonFECUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *devieAPI) :
m_deviceAPI(devieAPI),
m_sdrDaemonBuffer(m_rateDivider),
m_dataSocket(0),

6
plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h
Wyświetl plik

@ -30,13 +30,13 @@
class SampleSinkFifo;
class MessageQueue;
class QTimer;
class DeviceAPI;
class DeviceSourceAPI;
class SDRdaemonFECUDPHandler : public QObject
{
Q_OBJECT
public:
SDRdaemonFECUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *deviceAPI);
SDRdaemonFECUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceSourceAPI *deviceAPI);
~SDRdaemonFECUDPHandler();
void connectTimer(const QTimer* timer);
void start();
@ -48,7 +48,7 @@ public slots:
void dataReadyRead();
private:
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
SDRdaemonFECBuffer m_sdrDaemonBuffer;
QUdpSocket *m_dataSocket;
QHostAddress m_dataAddress;

70
sdrbase/device/deviceapi.cpp → sdrbase/device/devicesourceapi.cpp
Wyświetl plik

@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include "device/deviceapi.h"
#include <device/devicesourceapi.h>
#include "plugin/plugingui.h"
#include "plugin/pluginapi.h"
#include "plugin/plugininterface.h"
@ -23,7 +23,7 @@
#include "mainwindow.h"
#include "settings/preset.h"
DeviceAPI::DeviceAPI(MainWindow *mainWindow,
DeviceSourceAPI::DeviceSourceAPI(MainWindow *mainWindow,
int deviceTabIndex,
DSPDeviceSourceEngine *deviceEngine,
GLSpectrum *glSpectrum,
@ -38,122 +38,122 @@ DeviceAPI::DeviceAPI(MainWindow *mainWindow,
{
}
DeviceAPI::~DeviceAPI()
DeviceSourceAPI::~DeviceSourceAPI()
{
}
void DeviceAPI::addSink(BasebandSampleSink *sink)
void DeviceSourceAPI::addSink(BasebandSampleSink *sink)
{
m_deviceEngine->addSink(sink);
}
void DeviceAPI::removeSink(BasebandSampleSink* sink)
void DeviceSourceAPI::removeSink(BasebandSampleSink* sink)
{
m_deviceEngine->removeSink(sink);
}
void DeviceAPI::addThreadedSink(ThreadedBasebandSampleSink* sink)
void DeviceSourceAPI::addThreadedSink(ThreadedBasebandSampleSink* sink)
{
m_deviceEngine->addThreadedSink(sink);
}
void DeviceAPI::removeThreadedSink(ThreadedBasebandSampleSink* sink)
void DeviceSourceAPI::removeThreadedSink(ThreadedBasebandSampleSink* sink)
{
m_deviceEngine->removeThreadedSink(sink);
}
void DeviceAPI::setSource(DeviceSampleSource* source)
void DeviceSourceAPI::setSource(DeviceSampleSource* source)
{
m_deviceEngine->setSource(source);
}
bool DeviceAPI::initAcquisition()
bool DeviceSourceAPI::initAcquisition()
{
return m_deviceEngine->initAcquisition();
}
bool DeviceAPI::startAcquisition()
bool DeviceSourceAPI::startAcquisition()
{
return m_deviceEngine->startAcquisition();
}
void DeviceAPI::stopAcquisition()
void DeviceSourceAPI::stopAcquisition()
{
m_deviceEngine->stopAcquistion();
}
DSPDeviceSourceEngine::State DeviceAPI::state() const
DSPDeviceSourceEngine::State DeviceSourceAPI::state() const
{
return m_deviceEngine->state();
}
QString DeviceAPI::errorMessage()
QString DeviceSourceAPI::errorMessage()
{
return m_deviceEngine->errorMessage();
}
uint DeviceAPI::getDeviceUID() const
uint DeviceSourceAPI::getDeviceUID() const
{
return m_deviceEngine->getUID();
}
MessageQueue *DeviceAPI::getDeviceInputMessageQueue()
MessageQueue *DeviceSourceAPI::getDeviceInputMessageQueue()
{
return m_deviceEngine->getInputMessageQueue();
}
MessageQueue *DeviceAPI::getDeviceOutputMessageQueue()
MessageQueue *DeviceSourceAPI::getDeviceOutputMessageQueue()
{
return m_deviceEngine->getOutputMessageQueue();
}
void DeviceAPI::configureCorrections(bool dcOffsetCorrection, bool iqImbalanceCorrection)
void DeviceSourceAPI::configureCorrections(bool dcOffsetCorrection, bool iqImbalanceCorrection)
{
m_deviceEngine->configureCorrections(dcOffsetCorrection, iqImbalanceCorrection);
}
GLSpectrum *DeviceAPI::getSpectrum()
GLSpectrum *DeviceSourceAPI::getSpectrum()
{
return m_spectrum;
}
void DeviceAPI::addChannelMarker(ChannelMarker* channelMarker)
void DeviceSourceAPI::addChannelMarker(ChannelMarker* channelMarker)
{
m_spectrum->addChannelMarker(channelMarker);
}
ChannelWindow *DeviceAPI::getChannelWindow()
ChannelWindow *DeviceSourceAPI::getChannelWindow()
{
return m_channelWindow;
}
void DeviceAPI::addRollupWidget(QWidget *widget)
void DeviceSourceAPI::addRollupWidget(QWidget *widget)
{
m_channelWindow->addRollupWidget(widget);
}
void DeviceAPI::setInputGUI(QWidget* inputGUI, const QString& sourceDisplayName)
void DeviceSourceAPI::setInputGUI(QWidget* inputGUI, const QString& sourceDisplayName)
{
m_mainWindow->setInputGUI(m_deviceTabIndex, inputGUI, sourceDisplayName);
}
void DeviceAPI::setSampleSourceId(const QString& id)
void DeviceSourceAPI::setSampleSourceId(const QString& id)
{
m_sampleSourceId = id;
}
void DeviceAPI::setSampleSourceSerial(const QString& serial)
void DeviceSourceAPI::setSampleSourceSerial(const QString& serial)
{
m_sampleSourceSerial = serial;
}
void DeviceAPI::setSampleSourceSequence(int sequence)
void DeviceSourceAPI::setSampleSourceSequence(int sequence)
{
m_sampleSourceSequence = sequence;
m_deviceEngine->setSourceSequence(sequence);
}
void DeviceAPI::setSampleSourcePluginGUI(PluginGUI *gui)
void DeviceSourceAPI::setSampleSourcePluginGUI(PluginGUI *gui)
{
if (m_sampleSourcePluginGUI != 0)
{
@ -164,13 +164,13 @@ void DeviceAPI::setSampleSourcePluginGUI(PluginGUI *gui)
m_sampleSourcePluginGUI = gui;
}
void DeviceAPI::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)
void DeviceSourceAPI::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)
{
m_channelInstanceRegistrations.append(ChannelInstanceRegistration(channelName, pluginGUI));
renameChannelInstances();
}
void DeviceAPI::removeChannelInstance(PluginGUI* pluginGUI)
void DeviceSourceAPI::removeChannelInstance(PluginGUI* pluginGUI)
{
for(ChannelInstanceRegistrations::iterator it = m_channelInstanceRegistrations.begin(); it != m_channelInstanceRegistrations.end(); ++it)
{
@ -184,7 +184,7 @@ void DeviceAPI::removeChannelInstance(PluginGUI* pluginGUI)
renameChannelInstances();
}
void DeviceAPI::renameChannelInstances()
void DeviceSourceAPI::renameChannelInstances()
{
for(int i = 0; i < m_channelInstanceRegistrations.count(); i++)
{
@ -192,7 +192,7 @@ void DeviceAPI::renameChannelInstances()
}
}
void DeviceAPI::freeAll()
void DeviceSourceAPI::freeAll()
{
// while(!m_channelInstanceRegistrations.isEmpty())
// {
@ -217,7 +217,7 @@ void DeviceAPI::freeAll()
}
}
void DeviceAPI::loadSourceSettings(const Preset* preset)
void DeviceSourceAPI::loadSourceSettings(const Preset* preset)
{
qDebug("DeviceAPI::loadSourceSettings: Loading preset [%s | %s]\n", qPrintable(preset->getGroup()), qPrintable(preset->getDescription()));
@ -236,7 +236,7 @@ void DeviceAPI::loadSourceSettings(const Preset* preset)
}
}
void DeviceAPI::saveSourceSettings(Preset* preset)
void DeviceSourceAPI::saveSourceSettings(Preset* preset)
{
qDebug("DeviceAPI::saveSourceSettings");
@ -247,7 +247,7 @@ void DeviceAPI::saveSourceSettings(Preset* preset)
}
}
void DeviceAPI::loadChannelSettings(const Preset *preset, PluginAPI *pluginAPI)
void DeviceSourceAPI::loadChannelSettings(const Preset *preset, PluginAPI *pluginAPI)
{
qDebug("DeviceAPI::loadChannelSettings: Loading preset [%s | %s]\n", qPrintable(preset->getGroup()), qPrintable(preset->getDescription()));
@ -310,7 +310,7 @@ void DeviceAPI::loadChannelSettings(const Preset *preset, PluginAPI *pluginAPI)
renameChannelInstances();
}
void DeviceAPI::saveChannelSettings(Preset *preset)
void DeviceSourceAPI::saveChannelSettings(Preset *preset)
{
qDebug("DeviceAPI::saveChannelSettings");
@ -323,7 +323,7 @@ void DeviceAPI::saveChannelSettings(Preset *preset)
}
// sort by increasing delta frequency and type (i.e. name)
bool DeviceAPI::ChannelInstanceRegistration::operator<(const ChannelInstanceRegistration& other) const
bool DeviceSourceAPI::ChannelInstanceRegistration::operator<(const ChannelInstanceRegistration& other) const
{
if (m_gui && other.m_gui)
{

12
sdrbase/device/deviceapi.h → sdrbase/device/devicesourceapi.h
Wyświetl plik

@ -14,8 +14,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#ifndef SDRBASE_DEVICE_DEVICEAPI_H_
#define SDRBASE_DEVICE_DEVICEAPI_H_
#ifndef SDRBASE_DEVICE_DEVICESOURCEAPI_H_
#define SDRBASE_DEVICE_DEVICESOURCEAPI_H_
#include <QObject>
#include <QString>
@ -38,7 +38,7 @@ class PluginGUI;
class PluginAPI;
class Preset;
class SDRANGEL_API DeviceAPI : public QObject {
class SDRANGEL_API DeviceSourceAPI : public QObject {
Q_OBJECT
public:
@ -103,12 +103,12 @@ protected:
typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations;
DeviceAPI(MainWindow *mainWindow,
DeviceSourceAPI(MainWindow *mainWindow,
int deviceTabIndex,
DSPDeviceSourceEngine *deviceEngine,
GLSpectrum *glSpectrum,
ChannelWindow *channelWindow);
~DeviceAPI();
~DeviceSourceAPI();
void renameChannelInstances();
@ -129,4 +129,4 @@ protected:
};
#endif /* SDRBASE_DEVICE_DEVICEAPI_H_ */
#endif /* SDRBASE_DEVICE_DEVICESOURCEAPI_H_ */

6
sdrbase/gui/samplingdevicecontrol.h
Wyświetl plik

@ -30,7 +30,7 @@ namespace Ui {
class ChannelMarker;
class PluginManager;
class DeviceAPI;
class DeviceSourceAPI;
class SDRANGEL_API SamplingDeviceControl : public QWidget {
Q_OBJECT
@ -40,7 +40,7 @@ public:
~SamplingDeviceControl();
void setPluginManager(PluginManager *pluginManager) { m_pluginManager = pluginManager; }
void setDeviceAPI(DeviceAPI *devieAPI) { m_deviceAPI = devieAPI; }
void setDeviceAPI(DeviceSourceAPI *devieAPI) { m_deviceAPI = devieAPI; }
QComboBox *getDeviceSelector();
QPushButton *getDeviceSelectionConfirm();
void populateChannelSelector();
@ -48,7 +48,7 @@ public:
private:
Ui::SamplingDeviceControl* ui;
PluginManager *m_pluginManager;
DeviceAPI *m_deviceAPI;
DeviceSourceAPI *m_deviceAPI;
private slots:
// void on_showLoadedPlugins_clicked(bool checked);

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