From 32595f81b97f61b595a21f076a3f5203a2a6aa2b Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 11 Oct 2016 01:17:55 +0200 Subject: [PATCH] RxTx semantic move: renamed DeviceAPI to DeviceSourceAPI --- CMakeLists.txt | 4 +- .../channelrx/chanalyzer/chanalyzergui.cpp | 6 +- plugins/channelrx/chanalyzer/chanalyzergui.h | 8 +-- .../channelrx/chanalyzer/chanalyzerplugin.cpp | 4 +- .../channelrx/chanalyzer/chanalyzerplugin.h | 6 +- plugins/channelrx/demodam/amdemodgui.cpp | 6 +- plugins/channelrx/demodam/amdemodgui.h | 8 +-- plugins/channelrx/demodam/amplugin.cpp | 4 +- plugins/channelrx/demodam/amplugin.h | 6 +- plugins/channelrx/demodbfm/bfmdemodgui.cpp | 6 +- plugins/channelrx/demodbfm/bfmdemodgui.h | 8 +-- plugins/channelrx/demodbfm/bfmplugin.cpp | 4 +- plugins/channelrx/demodbfm/bfmplugin.h | 6 +- plugins/channelrx/demoddsd/dsddemodgui.cpp | 6 +- plugins/channelrx/demoddsd/dsddemodgui.h | 8 +-- plugins/channelrx/demoddsd/dsddemodplugin.cpp | 7 +- plugins/channelrx/demoddsd/dsddemodplugin.h | 6 +- plugins/channelrx/demodlora/lorademodgui.cpp | 6 +- plugins/channelrx/demodlora/lorademodgui.h | 8 +-- plugins/channelrx/demodlora/loraplugin.cpp | 4 +- plugins/channelrx/demodlora/loraplugin.h | 6 +- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 6 +- plugins/channelrx/demodnfm/nfmdemodgui.h | 8 +-- plugins/channelrx/demodnfm/nfmplugin.cpp | 4 +- plugins/channelrx/demodnfm/nfmplugin.h | 6 +- plugins/channelrx/demodssb/ssbdemodgui.cpp | 6 +- plugins/channelrx/demodssb/ssbdemodgui.h | 8 +-- plugins/channelrx/demodssb/ssbplugin.cpp | 7 +- plugins/channelrx/demodssb/ssbplugin.h | 6 +- plugins/channelrx/demodwfm/wfmdemodgui.cpp | 6 +- plugins/channelrx/demodwfm/wfmdemodgui.h | 8 +-- plugins/channelrx/demodwfm/wfmplugin.cpp | 4 +- plugins/channelrx/demodwfm/wfmplugin.h | 6 +- plugins/channelrx/tcpsrc/tcpsrcgui.cpp | 6 +- plugins/channelrx/tcpsrc/tcpsrcgui.h | 8 +-- plugins/channelrx/tcpsrc/tcpsrcplugin.cpp | 4 +- plugins/channelrx/tcpsrc/tcpsrcplugin.h | 6 +- plugins/channelrx/udpsrc/udpsrcgui.cpp | 6 +- plugins/channelrx/udpsrc/udpsrcgui.h | 8 +-- plugins/channelrx/udpsrc/udpsrcplugin.cpp | 4 +- plugins/channelrx/udpsrc/udpsrcplugin.h | 6 +- plugins/samplesource/airspy/airspygui.cpp | 4 +- plugins/samplesource/airspy/airspygui.h | 6 +- plugins/samplesource/airspy/airspyinput.cpp | 5 +- plugins/samplesource/airspy/airspyinput.h | 6 +- plugins/samplesource/airspy/airspyplugin.cpp | 5 +- plugins/samplesource/airspy/airspyplugin.h | 2 +- plugins/samplesource/bladerf/bladerfgui.cpp | 5 +- plugins/samplesource/bladerf/bladerfgui.h | 6 +- plugins/samplesource/bladerf/bladerfinput.cpp | 6 +- plugins/samplesource/bladerf/bladerfinput.h | 6 +- .../samplesource/bladerf/bladerfplugin.cpp | 4 +- plugins/samplesource/bladerf/bladerfplugin.h | 2 +- plugins/samplesource/fcdpro/fcdprogui.cpp | 4 +- plugins/samplesource/fcdpro/fcdprogui.h | 6 +- plugins/samplesource/fcdpro/fcdproinput.cpp | 5 +- plugins/samplesource/fcdpro/fcdproinput.h | 6 +- plugins/samplesource/fcdpro/fcdproplugin.cpp | 6 +- plugins/samplesource/fcdpro/fcdproplugin.h | 2 +- .../samplesource/fcdproplus/fcdproplusgui.cpp | 4 +- .../samplesource/fcdproplus/fcdproplusgui.h | 6 +- .../fcdproplus/fcdproplusinput.cpp | 5 +- .../samplesource/fcdproplus/fcdproplusinput.h | 6 +- .../fcdproplus/fcdproplusplugin.cpp | 6 +- .../fcdproplus/fcdproplusplugin.h | 2 +- .../samplesource/filesource/filesourcegui.cpp | 4 +- .../samplesource/filesource/filesourcegui.h | 6 +- .../filesource/filesourceplugin.cpp | 4 +- .../filesource/filesourceplugin.h | 2 +- plugins/samplesource/hackrf/hackrfgui.cpp | 4 +- plugins/samplesource/hackrf/hackrfgui.h | 6 +- plugins/samplesource/hackrf/hackrfinput.cpp | 5 +- plugins/samplesource/hackrf/hackrfinput.h | 6 +- plugins/samplesource/hackrf/hackrfplugin.cpp | 5 +- plugins/samplesource/hackrf/hackrfplugin.h | 2 +- plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 4 +- plugins/samplesource/rtlsdr/rtlsdrgui.h | 6 +- plugins/samplesource/rtlsdr/rtlsdrinput.cpp | 6 +- plugins/samplesource/rtlsdr/rtlsdrinput.h | 6 +- plugins/samplesource/rtlsdr/rtlsdrplugin.cpp | 6 +- plugins/samplesource/rtlsdr/rtlsdrplugin.h | 2 +- .../samplesource/sdrdaemon/sdrdaemongui.cpp | 5 +- plugins/samplesource/sdrdaemon/sdrdaemongui.h | 6 +- .../samplesource/sdrdaemon/sdrdaemoninput.cpp | 4 +- .../samplesource/sdrdaemon/sdrdaemoninput.h | 6 +- .../sdrdaemon/sdrdaemonplugin.cpp | 4 +- .../samplesource/sdrdaemon/sdrdaemonplugin.h | 2 +- .../sdrdaemon/sdrdaemonudphandler.cpp | 6 +- .../sdrdaemon/sdrdaemonudphandler.h | 6 +- .../sdrdaemonfec/sdrdaemonfecgui.cpp | 5 +- .../sdrdaemonfec/sdrdaemonfecgui.h | 6 +- .../sdrdaemonfec/sdrdaemonfecinput.cpp | 4 +- .../sdrdaemonfec/sdrdaemonfecinput.h | 6 +- .../sdrdaemonfec/sdrdaemonfecplugin.cpp | 5 +- .../sdrdaemonfec/sdrdaemonfecplugin.h | 2 +- .../sdrdaemonfec/sdrdaemonfecudphandler.cpp | 4 +- .../sdrdaemonfec/sdrdaemonfecudphandler.h | 6 +- .../{deviceapi.cpp => devicesourceapi.cpp} | 70 +++++++++---------- .../device/{deviceapi.h => devicesourceapi.h} | 12 ++-- sdrbase/gui/samplingdevicecontrol.h | 6 +- sdrbase/mainwindow.cpp | 4 +- sdrbase/mainwindow.h | 4 +- sdrbase/plugin/plugininterface.h | 6 +- sdrbase/plugin/pluginmanager.cpp | 12 ++-- sdrbase/plugin/pluginmanager.h | 12 ++-- sdrbase/sdrbase.pro | 4 +- 106 files changed, 333 insertions(+), 313 deletions(-) rename sdrbase/device/{deviceapi.cpp => devicesourceapi.cpp} (80%) rename sdrbase/device/{deviceapi.h => devicesourceapi.h} (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b379fb05d..fbc210f1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index 56921b1b6..399eb9990 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -16,6 +16,7 @@ #include "../../channelrx/chanalyzer/chanalyzergui.h" +#include #include #include #include @@ -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), diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index b94671793..5fa17eaed 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -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); diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp index 0fd71da69..dc2db282e 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp @@ -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); } diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.h b/plugins/channelrx/chanalyzer/chanalyzerplugin.h index 37198e344..186e34005 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.h +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.h @@ -4,7 +4,7 @@ #include #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 diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 62ac7bf1b..27ea14bff 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -1,5 +1,6 @@ #include "../../channelrx/demodam/amdemodgui.h" +#include #include #include #include @@ -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), diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index 99facaa59..171c12275 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -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); diff --git a/plugins/channelrx/demodam/amplugin.cpp b/plugins/channelrx/demodam/amplugin.cpp index 99df5cb52..e4b56e730 100644 --- a/plugins/channelrx/demodam/amplugin.cpp +++ b/plugins/channelrx/demodam/amplugin.cpp @@ -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); } diff --git a/plugins/channelrx/demodam/amplugin.h b/plugins/channelrx/demodam/amplugin.h index ade65eeb9..ce4aab8bd 100644 --- a/plugins/channelrx/demodam/amplugin.h +++ b/plugins/channelrx/demodam/amplugin.h @@ -4,7 +4,7 @@ #include #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 diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index a84d7d0ea..e28cfd6d3 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -17,6 +17,7 @@ #include "../../channelrx/demodbfm/bfmdemodgui.h" +#include #include #include #include @@ -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), diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h index 892868efe..3b6298666 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.h +++ b/plugins/channelrx/demodbfm/bfmdemodgui.h @@ -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); diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index 6edf37981..88a7f163e 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -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); } diff --git a/plugins/channelrx/demodbfm/bfmplugin.h b/plugins/channelrx/demodbfm/bfmplugin.h index 68793cc7b..d50efd044 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.h +++ b/plugins/channelrx/demodbfm/bfmplugin.h @@ -21,7 +21,7 @@ #include #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 diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index bc9643493..c28f09647 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -17,6 +17,7 @@ #include "../../channelrx/demoddsd/dsddemodgui.h" +#include #include #include #include @@ -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), diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h index 20c533c0b..7b8b47edf 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.h +++ b/plugins/channelrx/demoddsd/dsddemodgui.h @@ -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); diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index ae54e15b6..7cab6107f 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -17,10 +17,9 @@ #include "../../channelrx/demoddsd/dsddemodplugin.h" +#include #include #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); } diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.h b/plugins/channelrx/demoddsd/dsddemodplugin.h index 0e02115c6..b72915a43 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.h +++ b/plugins/channelrx/demoddsd/dsddemodplugin.h @@ -21,7 +21,7 @@ #include #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 diff --git a/plugins/channelrx/demodlora/lorademodgui.cpp b/plugins/channelrx/demodlora/lorademodgui.cpp index 3feb0a68b..d8c0c77b3 100644 --- a/plugins/channelrx/demodlora/lorademodgui.cpp +++ b/plugins/channelrx/demodlora/lorademodgui.cpp @@ -1,6 +1,7 @@ #include "../../channelrx/demodlora/lorademodgui.h" #include "../../channelrx/demodlora/lorademodgui.h" +#include #include #include #include @@ -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), diff --git a/plugins/channelrx/demodlora/lorademodgui.h b/plugins/channelrx/demodlora/lorademodgui.h index 6026b203d..5bada3b12 100644 --- a/plugins/channelrx/demodlora/lorademodgui.h +++ b/plugins/channelrx/demodlora/lorademodgui.h @@ -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); diff --git a/plugins/channelrx/demodlora/loraplugin.cpp b/plugins/channelrx/demodlora/loraplugin.cpp index 2dbf28a3d..29d4bec3a 100644 --- a/plugins/channelrx/demodlora/loraplugin.cpp +++ b/plugins/channelrx/demodlora/loraplugin.cpp @@ -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); } diff --git a/plugins/channelrx/demodlora/loraplugin.h b/plugins/channelrx/demodlora/loraplugin.h index 843d8ce5a..2e51fd237 100644 --- a/plugins/channelrx/demodlora/loraplugin.h +++ b/plugins/channelrx/demodlora/loraplugin.h @@ -4,7 +4,7 @@ #include #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 diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 5050f5646..e85cdee26 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -1,5 +1,6 @@ #include "../../channelrx/demodnfm/nfmdemodgui.h" +#include #include #include #include @@ -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), diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index c7254191c..f8c3cab9c 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -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); diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index e9ecb552d..7604145cf 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -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); } diff --git a/plugins/channelrx/demodnfm/nfmplugin.h b/plugins/channelrx/demodnfm/nfmplugin.h index 3cf72b43a..1505fe00d 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.h +++ b/plugins/channelrx/demodnfm/nfmplugin.h @@ -4,7 +4,7 @@ #include #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 diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index b8326e80e..754b85364 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -1,6 +1,7 @@ #include "../../channelrx/demodssb/ssbdemodgui.h" #include "../../channelrx/demodssb/ssbdemodgui.h" +#include #include #include #include @@ -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), diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index 227ad8a48..33cfbea71 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -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); diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index 11228ce20..36877c6f3 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -1,9 +1,8 @@ #include "../../channelrx/demodssb/ssbplugin.h" +#include #include #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); } diff --git a/plugins/channelrx/demodssb/ssbplugin.h b/plugins/channelrx/demodssb/ssbplugin.h index a5df1dc66..dea4937b1 100644 --- a/plugins/channelrx/demodssb/ssbplugin.h +++ b/plugins/channelrx/demodssb/ssbplugin.h @@ -4,7 +4,7 @@ #include #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 diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index d143ace95..6493d74ab 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -1,5 +1,6 @@ #include "../../channelrx/demodwfm/wfmdemodgui.h" +#include #include #include #include @@ -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), diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index 96cf76345..9a921dc28 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -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); diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index 1d4913d67..5ded30d2a 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -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); } diff --git a/plugins/channelrx/demodwfm/wfmplugin.h b/plugins/channelrx/demodwfm/wfmplugin.h index 1e6501f0e..5000f3173 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.h +++ b/plugins/channelrx/demodwfm/wfmplugin.h @@ -4,7 +4,7 @@ #include #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 diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp index f3f05118d..d99388b32 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp @@ -1,9 +1,9 @@ #include "../../channelrx/tcpsrc/tcpsrcgui.h" +#include #include #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), diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.h b/plugins/channelrx/tcpsrc/tcpsrcgui.h index 4a313ebbf..bcf47b4b3 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcgui.h +++ b/plugins/channelrx/tcpsrc/tcpsrcgui.h @@ -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 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); diff --git a/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp b/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp index f78bebb9a..dd3e9bb20 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp @@ -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); diff --git a/plugins/channelrx/tcpsrc/tcpsrcplugin.h b/plugins/channelrx/tcpsrc/tcpsrcplugin.h index 02138ad0d..95f483d1e 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcplugin.h +++ b/plugins/channelrx/tcpsrc/tcpsrcplugin.h @@ -4,7 +4,7 @@ #include #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 diff --git a/plugins/channelrx/udpsrc/udpsrcgui.cpp b/plugins/channelrx/udpsrc/udpsrcgui.cpp index 69336ffbe..fc8c02082 100644 --- a/plugins/channelrx/udpsrc/udpsrcgui.cpp +++ b/plugins/channelrx/udpsrc/udpsrcgui.cpp @@ -17,10 +17,10 @@ #include "../../channelrx/udpsrc/udpsrcgui.h" +#include #include #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), diff --git a/plugins/channelrx/udpsrc/udpsrcgui.h b/plugins/channelrx/udpsrc/udpsrcgui.h index e1b851f80..9b7dc48b3 100644 --- a/plugins/channelrx/udpsrc/udpsrcgui.h +++ b/plugins/channelrx/udpsrc/udpsrcgui.h @@ -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 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); diff --git a/plugins/channelrx/udpsrc/udpsrcplugin.cpp b/plugins/channelrx/udpsrc/udpsrcplugin.cpp index f23f201bc..63f61f64e 100644 --- a/plugins/channelrx/udpsrc/udpsrcplugin.cpp +++ b/plugins/channelrx/udpsrc/udpsrcplugin.cpp @@ -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); diff --git a/plugins/channelrx/udpsrc/udpsrcplugin.h b/plugins/channelrx/udpsrc/udpsrcplugin.h index 1973987fa..c190b8c71 100644 --- a/plugins/channelrx/udpsrc/udpsrcplugin.h +++ b/plugins/channelrx/udpsrc/udpsrcplugin.h @@ -21,7 +21,7 @@ #include #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 diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index c112df36a..5950c0442 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -21,16 +21,16 @@ #include "airspygui.h" +#include #include #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), diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h index 23c7b78e6..dda5e0dd0 100644 --- a/plugins/samplesource/airspy/airspygui.h +++ b/plugins/samplesource/airspy/airspygui.h @@ -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; diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp index 57f27177c..a9d91944a 100644 --- a/plugins/samplesource/airspy/airspyinput.cpp +++ b/plugins/samplesource/airspy/airspyinput.cpp @@ -20,7 +20,8 @@ #include "airspygui.h" #include "airspyinput.h" -#include "device/deviceapi.h" + +#include #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), diff --git a/plugins/samplesource/airspy/airspyinput.h b/plugins/samplesource/airspy/airspyinput.h index 94bd5ef7f..dd438bfd9 100644 --- a/plugins/samplesource/airspy/airspyinput.h +++ b/plugins/samplesource/airspy/airspyinput.h @@ -23,7 +23,7 @@ #include #include -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; diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp index 6ee219ed8..c9737b9b9 100644 --- a/plugins/samplesource/airspy/airspyplugin.cpp +++ b/plugins/samplesource/airspy/airspyplugin.cpp @@ -20,8 +20,9 @@ #include "airspygui.h" #include "airspyplugin.h" + +#include #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) { diff --git a/plugins/samplesource/airspy/airspyplugin.h b/plugins/samplesource/airspy/airspyplugin.h index 9892eaf6f..de419c154 100644 --- a/plugins/samplesource/airspy/airspyplugin.h +++ b/plugins/samplesource/airspy/airspyplugin.h @@ -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; diff --git a/plugins/samplesource/bladerf/bladerfgui.cpp b/plugins/samplesource/bladerf/bladerfgui.cpp index e6f02c0d5..669a5e84e 100644 --- a/plugins/samplesource/bladerf/bladerfgui.cpp +++ b/plugins/samplesource/bladerf/bladerfgui.cpp @@ -20,15 +20,16 @@ #include #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 #include -BladerfGui::BladerfGui(DeviceAPI *deviceAPI, QWidget* parent) : +BladerfGui::BladerfGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : QWidget(parent), ui(new Ui::BladerfGui), m_deviceAPI(deviceAPI), diff --git a/plugins/samplesource/bladerf/bladerfgui.h b/plugins/samplesource/bladerf/bladerfgui.h index d8fac68a5..9300f3476 100644 --- a/plugins/samplesource/bladerf/bladerfgui.h +++ b/plugins/samplesource/bladerf/bladerfgui.h @@ -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; diff --git a/plugins/samplesource/bladerf/bladerfinput.cpp b/plugins/samplesource/bladerf/bladerfinput.cpp index 55f7f9fe2..edaff967c 100644 --- a/plugins/samplesource/bladerf/bladerfinput.cpp +++ b/plugins/samplesource/bladerf/bladerfinput.cpp @@ -18,18 +18,20 @@ #include #include -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "bladerfgui.h" #include "bladerfinput.h" + +#include + #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), diff --git a/plugins/samplesource/bladerf/bladerfinput.h b/plugins/samplesource/bladerf/bladerfinput.h index a2f15da64..185dd27e4 100644 --- a/plugins/samplesource/bladerf/bladerfinput.h +++ b/plugins/samplesource/bladerf/bladerfinput.h @@ -23,7 +23,7 @@ #include #include -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; diff --git a/plugins/samplesource/bladerf/bladerfplugin.cpp b/plugins/samplesource/bladerf/bladerfplugin.cpp index 6473ebaff..184234b3a 100644 --- a/plugins/samplesource/bladerf/bladerfplugin.cpp +++ b/plugins/samplesource/bladerf/bladerfplugin.cpp @@ -18,10 +18,10 @@ #include #include #include "plugin/pluginapi.h" -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "bladerfgui.h" #include "bladerfplugin.h" +#include 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) { diff --git a/plugins/samplesource/bladerf/bladerfplugin.h b/plugins/samplesource/bladerf/bladerfplugin.h index 539950254..47246feb8 100644 --- a/plugins/samplesource/bladerf/bladerfplugin.h +++ b/plugins/samplesource/bladerf/bladerfplugin.h @@ -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; diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index 6b8b6aa82..4a880bd47 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -17,17 +17,17 @@ #include #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 #include #include "fcdproconst.h" -FCDProGui::FCDProGui(DeviceAPI *deviceAPI, QWidget* parent) : +FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : QWidget(parent), ui(new Ui::FCDProGui), m_deviceAPI(deviceAPI), diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h index 52cb71c45..4bf07b36c 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -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; diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index b7e3baefd..a344cc64b 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -21,11 +21,12 @@ #include #include -#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "fcdproinput.h" +#include + #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(), diff --git a/plugins/samplesource/fcdpro/fcdproinput.h b/plugins/samplesource/fcdpro/fcdproinput.h index 49f10ca4d..0936698e3 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.h +++ b/plugins/samplesource/fcdpro/fcdproinput.h @@ -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; diff --git a/plugins/samplesource/fcdpro/fcdproplugin.cpp b/plugins/samplesource/fcdpro/fcdproplugin.cpp index 250717c39..8bb585026 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.cpp +++ b/plugins/samplesource/fcdpro/fcdproplugin.cpp @@ -17,9 +17,11 @@ #include #include #include "plugin/pluginapi.h" -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "fcdproplugin.h" + +#include + #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::interfaceIID) { diff --git a/plugins/samplesource/fcdpro/fcdproplugin.h b/plugins/samplesource/fcdpro/fcdproplugin.h index 7244e6fac..1384b210f 100644 --- a/plugins/samplesource/fcdpro/fcdproplugin.h +++ b/plugins/samplesource/fcdpro/fcdproplugin.h @@ -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; diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 9ab05fc06..3758f385e 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -18,17 +18,17 @@ #include #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 #include #include "fcdproplusconst.h" -FCDProPlusGui::FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent) : +FCDProPlusGui::FCDProPlusGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : QWidget(parent), ui(new Ui::FCDProPlusGui), m_deviceAPI(deviceAPI), diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h index 71b3b83e8..0c4587834 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -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; diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index e1180d160..c6fba6dd3 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -20,11 +20,12 @@ #include #include -#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "fcdproplusinput.h" +#include + #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(), diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.h b/plugins/samplesource/fcdproplus/fcdproplusinput.h index 783bc27c1..0a5544c38 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.h +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.h @@ -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; diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp index 9d6931504..e74de161d 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp @@ -17,9 +17,11 @@ #include #include #include "plugin/pluginapi.h" -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "fcdproplusplugin.h" + +#include + #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::interfaceIID) { diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.h b/plugins/samplesource/fcdproplus/fcdproplusplugin.h index dac14385d..11aaae36e 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusplugin.h +++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.h @@ -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; diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp index e5abe9a2e..3bc10e1fc 100644 --- a/plugins/samplesource/filesource/filesourcegui.cpp +++ b/plugins/samplesource/filesource/filesourcegui.cpp @@ -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 -FileSourceGui::FileSourceGui(DeviceAPI *deviceAPI, QWidget* parent) : +FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : QWidget(parent), ui(new Ui::FileSourceGui), m_deviceAPI(deviceAPI), diff --git a/plugins/samplesource/filesource/filesourcegui.h b/plugins/samplesource/filesource/filesourcegui.h index fc3e43a1f..375da1a9f 100644 --- a/plugins/samplesource/filesource/filesourcegui.h +++ b/plugins/samplesource/filesource/filesourcegui.h @@ -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 m_gains; diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index ccc273af6..fc63357ec 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -17,11 +17,11 @@ #include #include #include "plugin/pluginapi.h" -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "filesourcegui.h" #include "filesourceplugin.h" +#include 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) { diff --git a/plugins/samplesource/filesource/filesourceplugin.h b/plugins/samplesource/filesource/filesourceplugin.h index fe1884049..aaa4bc856 100644 --- a/plugins/samplesource/filesource/filesourceplugin.h +++ b/plugins/samplesource/filesource/filesourceplugin.h @@ -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; diff --git a/plugins/samplesource/hackrf/hackrfgui.cpp b/plugins/samplesource/hackrf/hackrfgui.cpp index 385f29850..07ecea935 100644 --- a/plugins/samplesource/hackrf/hackrfgui.cpp +++ b/plugins/samplesource/hackrf/hackrfgui.cpp @@ -19,18 +19,18 @@ #include -#include "device/deviceapi.h" #include "gui/colormapper.h" #include "gui/glspectrum.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" #include "hackrfgui.h" +#include #include #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), diff --git a/plugins/samplesource/hackrf/hackrfgui.h b/plugins/samplesource/hackrf/hackrfgui.h index dbfddeac6..3c9b4b78c 100644 --- a/plugins/samplesource/hackrf/hackrfgui.h +++ b/plugins/samplesource/hackrf/hackrfgui.h @@ -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; diff --git a/plugins/samplesource/hackrf/hackrfinput.cpp b/plugins/samplesource/hackrf/hackrfinput.cpp index c299e207c..432a1d81d 100644 --- a/plugins/samplesource/hackrf/hackrfinput.cpp +++ b/plugins/samplesource/hackrf/hackrfinput.cpp @@ -18,19 +18,20 @@ #include #include -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "hackrfinput.h" +#include + #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), diff --git a/plugins/samplesource/hackrf/hackrfinput.h b/plugins/samplesource/hackrf/hackrfinput.h index 1864838be..c631f5953 100644 --- a/plugins/samplesource/hackrf/hackrfinput.h +++ b/plugins/samplesource/hackrf/hackrfinput.h @@ -22,7 +22,7 @@ #include "hackrfsettings.h" #include -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; diff --git a/plugins/samplesource/hackrf/hackrfplugin.cpp b/plugins/samplesource/hackrf/hackrfplugin.cpp index dd25dff8a..80587f140 100644 --- a/plugins/samplesource/hackrf/hackrfplugin.cpp +++ b/plugins/samplesource/hackrf/hackrfplugin.cpp @@ -20,9 +20,10 @@ #include "hackrfplugin.h" +#include + #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) { diff --git a/plugins/samplesource/hackrf/hackrfplugin.h b/plugins/samplesource/hackrf/hackrfplugin.h index 1adb1d966..f00a092dd 100644 --- a/plugins/samplesource/hackrf/hackrfplugin.h +++ b/plugins/samplesource/hackrf/hackrfplugin.h @@ -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; diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index a1ffce7a1..b8507a870 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -19,16 +19,16 @@ #include "rtlsdrgui.h" +#include #include #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), diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h index 7abd127f0..4386e6f85 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.h +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h @@ -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; diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index f0075a65e..7f879cc4a 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -19,16 +19,18 @@ #include #include #include "rtlsdrinput.h" + +#include + #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), diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.h b/plugins/samplesource/rtlsdr/rtlsdrinput.h index a8153efa9..6d6b131d0 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.h +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.h @@ -24,7 +24,7 @@ #include #include -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; diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index 99e9eee2a..622c43b46 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -2,9 +2,11 @@ #include #include #include "plugin/pluginapi.h" -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "rtlsdrplugin.h" + +#include + #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); diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.h b/plugins/samplesource/rtlsdr/rtlsdrplugin.h index 6f061157a..849ad6293 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.h +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.h @@ -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; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp index a614214a2..6412b7a59 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp @@ -30,7 +30,6 @@ #include #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 #include -SDRdaemonGui::SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent) : +SDRdaemonGui::SDRdaemonGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : QWidget(parent), ui(new Ui::SDRdaemonGui), m_deviceAPI(deviceAPI), diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.h b/plugins/samplesource/sdrdaemon/sdrdaemongui.h index cf7aa3389..227c2e44a 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.h @@ -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; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp b/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp index 8a2942f54..420184801 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp @@ -18,13 +18,13 @@ #include #include -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "sdrdaemongui.h" #include "sdrdaemoninput.h" +#include #include #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), diff --git a/plugins/samplesource/sdrdaemon/sdrdaemoninput.h b/plugins/samplesource/sdrdaemon/sdrdaemoninput.h index c4568820d..319396f90 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemoninput.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemoninput.h @@ -24,7 +24,7 @@ #include #include -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; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp index 016c681ac..21d9cb0bd 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp @@ -17,11 +17,11 @@ #include #include #include "plugin/pluginapi.h" -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "sdrdaemongui.h" #include "sdrdaemonplugin.h" +#include 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) { diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h index 8f2b74845..2a224ea01 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemonplugin.h @@ -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; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp index 7d3f420d4..4ac315f4c 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp @@ -19,13 +19,15 @@ #include #include -#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "sdrdaemonudphandler.h" + +#include + #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), diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h index 0c0aef7a9..1beebfa2f 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h @@ -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; diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp index 072af202c..cea41a000 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp @@ -30,7 +30,6 @@ #include #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 #include -SDRdaemonFECGui::SDRdaemonFECGui(DeviceAPI *deviceAPI, QWidget* parent) : +SDRdaemonFECGui::SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : QWidget(parent), ui(new Ui::SDRdaemonFECGui), m_deviceAPI(deviceAPI), diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h index 8f249dc4b..f7032b65b 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h @@ -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; diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp index d74163a77..288c0b6f6 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp @@ -18,12 +18,12 @@ #include #include -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "sdrdaemonfecinput.h" +#include #include #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), diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h index 9052a2190..e8be0e066 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h @@ -24,7 +24,7 @@ #include #include -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; diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp index 74d97ab1d..d8e6bc18a 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp @@ -17,11 +17,12 @@ #include #include #include "plugin/pluginapi.h" -#include "device/deviceapi.h" #include "util/simpleserializer.h" #include "sdrdaemonfecplugin.h" +#include + #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) { diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h index 07facd71b..a09fb46cd 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h @@ -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; diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp index be4089534..3944bfe69 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp @@ -19,13 +19,13 @@ #include #include -#include "device/deviceapi.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "sdrdaemonfecinput.h" #include "sdrdaemonfecudphandler.h" +#include -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), diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h index b038f8814..0dd3d29c8 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h @@ -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; diff --git a/sdrbase/device/deviceapi.cpp b/sdrbase/device/devicesourceapi.cpp similarity index 80% rename from sdrbase/device/deviceapi.cpp rename to sdrbase/device/devicesourceapi.cpp index e745bed33..dcacf17ac 100644 --- a/sdrbase/device/deviceapi.cpp +++ b/sdrbase/device/devicesourceapi.cpp @@ -14,7 +14,7 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include "device/deviceapi.h" +#include #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) { diff --git a/sdrbase/device/deviceapi.h b/sdrbase/device/devicesourceapi.h similarity index 95% rename from sdrbase/device/deviceapi.h rename to sdrbase/device/devicesourceapi.h index 24b6e6831..0df8a87a9 100644 --- a/sdrbase/device/deviceapi.h +++ b/sdrbase/device/devicesourceapi.h @@ -14,8 +14,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#ifndef SDRBASE_DEVICE_DEVICEAPI_H_ -#define SDRBASE_DEVICE_DEVICEAPI_H_ +#ifndef SDRBASE_DEVICE_DEVICESOURCEAPI_H_ +#define SDRBASE_DEVICE_DEVICESOURCEAPI_H_ #include #include @@ -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 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_ */ diff --git a/sdrbase/gui/samplingdevicecontrol.h b/sdrbase/gui/samplingdevicecontrol.h index ee2b65fb7..04d47c225 100644 --- a/sdrbase/gui/samplingdevicecontrol.h +++ b/sdrbase/gui/samplingdevicecontrol.h @@ -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); diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index ae0d161b7..e4bfe2087 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include #include #include #include @@ -44,7 +45,6 @@ #include "dsp/dspcommands.h" #include "plugin/plugingui.h" #include "plugin/pluginapi.h" -#include "device/deviceapi.h" #include "plugin/plugingui.h" #include "gui/glspectrum.h" @@ -182,7 +182,7 @@ void MainWindow::addDevice() m_deviceUIs.push_back(new DeviceUISet(m_masterTimer)); m_deviceUIs.back()->m_deviceEngine = dspDeviceSourceEngine; - DeviceAPI *deviceAPI = new DeviceAPI(this, m_deviceUIs.size()-1, dspDeviceSourceEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow); + DeviceSourceAPI *deviceAPI = new DeviceSourceAPI(this, m_deviceUIs.size()-1, dspDeviceSourceEngine, m_deviceUIs.back()->m_spectrum, m_deviceUIs.back()->m_channelWindow); m_deviceUIs.back()->m_deviceAPI = deviceAPI; m_deviceUIs.back()->m_samplingDeviceControl->setDeviceAPI(deviceAPI); diff --git a/sdrbase/mainwindow.h b/sdrbase/mainwindow.h index 1b0f478fd..c71f45e9a 100644 --- a/sdrbase/mainwindow.h +++ b/sdrbase/mainwindow.h @@ -44,7 +44,7 @@ class PluginAPI; class PluginGUI; class ChannelMarker; class PluginManager; -class DeviceAPI; +class DeviceSourceAPI; class PluginInterface; class QWidget; @@ -64,7 +64,7 @@ public: ChannelWindow *m_channelWindow; SamplingDeviceControl *m_samplingDeviceControl; DSPDeviceSourceEngine *m_deviceEngine; - DeviceAPI *m_deviceAPI; + DeviceSourceAPI *m_deviceAPI; QByteArray m_mainWindowState; DeviceUISet(QTimer& timer); diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index 2848f15d1..232cf4286 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -15,7 +15,7 @@ struct PluginDescriptor { }; class PluginAPI; -class DeviceAPI; +class DeviceSourceAPI; class PluginGUI; class QWidget; @@ -45,10 +45,10 @@ public: virtual const PluginDescriptor& getPluginDescriptor() const = 0; virtual void initPlugin(PluginAPI* pluginAPI) = 0; - virtual PluginGUI* createChannel(const QString& channelName, DeviceAPI *deviceAPI) { return 0; } + virtual PluginGUI* createChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { return 0; } virtual SampleSourceDevices enumSampleSources() { return SampleSourceDevices(); } - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceAPI *deviceAPI) + virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { return 0; } diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index a5fcaa4db..81131c398 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -5,7 +6,6 @@ #include "plugin/pluginmanager.h" #include "plugin/plugingui.h" -#include "device/deviceapi.h" #include "settings/preset.h" #include "mainwindow.h" #include "gui/glspectrum.h" @@ -189,7 +189,7 @@ void PluginManager::fillSampleSourceSelector(QComboBox* comboBox, uint deviceUID } } -int PluginManager::selectSampleSourceByIndex(int index, DeviceAPI *deviceAPI) +int PluginManager::selectSampleSourceByIndex(int index, DeviceSourceAPI *deviceAPI) { qDebug("PluginManager::selectSampleSourceByIndex: index: %d", index); @@ -229,7 +229,7 @@ int PluginManager::selectSampleSourceByIndex(int index, DeviceAPI *deviceAPI) return index; } -int PluginManager::selectFirstSampleSource(const QString& sourceId, DeviceAPI *deviceAPI) +int PluginManager::selectFirstSampleSource(const QString& sourceId, DeviceSourceAPI *deviceAPI) { qDebug("PluginManager::selectFirstSampleSource by id: [%s]", qPrintable(sourceId)); @@ -279,7 +279,7 @@ int PluginManager::selectFirstSampleSource(const QString& sourceId, DeviceAPI *d return index; } -int PluginManager::selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, int sourceSequence, DeviceAPI *deviceAPI) +int PluginManager::selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, int sourceSequence, DeviceSourceAPI *deviceAPI) { qDebug("PluginManager::selectSampleSourceBySequence by sequence: id: %s ser: %s seq: %d", qPrintable(sourceId), qPrintable(sourceSerial), sourceSequence); @@ -353,7 +353,7 @@ int PluginManager::selectSampleSourceBySerialOrSequence(const QString& sourceId, return index; } -void PluginManager::selectSampleSourceByDevice(void *devicePtr, DeviceAPI *deviceAPI) +void PluginManager::selectSampleSourceByDevice(void *devicePtr, DeviceSourceAPI *deviceAPI) { SampleSourceDevice *sampleSourceDevice = (SampleSourceDevice *) devicePtr; @@ -428,7 +428,7 @@ void PluginManager::populateChannelComboBox(QComboBox *channels) } } -void PluginManager::createChannelInstance(int channelPluginIndex, DeviceAPI *deviceAPI) +void PluginManager::createChannelInstance(int channelPluginIndex, DeviceSourceAPI *deviceAPI) { if (channelPluginIndex < m_channelRegistrations.size()) { diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index 02e277b62..d4e9317ea 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -13,7 +13,7 @@ class Preset; class MainWindow; class Message; class MessageQueue; -class DeviceAPI; +class DeviceSourceAPI; class SDRANGEL_API PluginManager : public QObject { Q_OBJECT @@ -50,13 +50,13 @@ public: void duplicateLocalSampleSourceDevices(uint deviceUID); void fillSampleSourceSelector(QComboBox* comboBox, uint deviceUID); - int selectSampleSourceByIndex(int index, DeviceAPI *deviceAPI); - int selectFirstSampleSource(const QString& sourceId, DeviceAPI *deviceAPI); - int selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, int sourceSequence, DeviceAPI *deviceAPI); - void selectSampleSourceByDevice(void *devicePtr, DeviceAPI *deviceAPI); + int selectSampleSourceByIndex(int index, DeviceSourceAPI *deviceAPI); + int selectFirstSampleSource(const QString& sourceId, DeviceSourceAPI *deviceAPI); + int selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, int sourceSequence, DeviceSourceAPI *deviceAPI); + void selectSampleSourceByDevice(void *devicePtr, DeviceSourceAPI *deviceAPI); void populateChannelComboBox(QComboBox *channels); - void createChannelInstance(int channelPluginIndex, DeviceAPI *deviceAPI); + void createChannelInstance(int channelPluginIndex, DeviceSourceAPI *deviceAPI); private: struct SampleSourceRegistration { diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index 6a6b9039c..dd6fd0e72 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -30,7 +30,7 @@ SOURCES += mainwindow.cpp\ audio/audiodeviceinfo.cpp\ audio/audiofifo.cpp\ audio/audiooutput.cpp\ - device/deviceapi.cpp\ + device/devicesourceapi.cpp\ dsp/afsquelch.cpp\ dsp/agc.cpp\ dsp/downchannelizer.cpp\ @@ -106,7 +106,7 @@ HEADERS += mainwindow.h\ audio/audiodeviceinfo.h\ audio/audiofifo.h\ audio/audiooutput.h\ - device/deviceapi.h\ + device/devicesourceapi.h\ dsp/afsquelch.h\ dsp/downchannelizer.h\ dsp/channelmarker.h\