From 7688f187bc65e7807c1d3de9219385181364be47 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 5 Aug 2019 00:10:56 +0200 Subject: [PATCH] REST API: config: use specialized ChannelWebAPIAdapter class similar to what has been done for devices --- plugins/channelrx/demodam/amdemodplugin.cpp | 2 +- plugins/channelrx/demodam/amdemodplugin.h | 2 +- .../demodam/amdemodwebapiadapter.cpp | 13 +++- .../channelrx/demodam/amdemodwebapiadapter.h | 24 ++----- .../demodbfm/bfmdemodwebapiadapter.cpp | 3 +- .../demodbfm/bfmdemodwebapiadapter.h | 20 +----- plugins/channelrx/demodbfm/bfmplugin.cpp | 2 +- plugins/channelrx/demodbfm/bfmplugin.h | 2 +- plugins/channelrx/demoddsd/dsddemodplugin.cpp | 2 +- plugins/channelrx/demoddsd/dsddemodplugin.h | 2 +- .../demoddsd/dsddemodwebapiadapter.cpp | 13 +++- .../demoddsd/dsddemodwebapiadapter.h | 24 ++----- .../demodfreedv/freedvdemodwebapiadapter.cpp | 3 +- .../demodfreedv/freedvdemodwebapiadapter.h | 20 +----- .../channelrx/demodfreedv/freedvplugin.cpp | 2 +- plugins/channelrx/demodfreedv/freedvplugin.h | 2 +- .../demodnfm/nfmdemodwebapiadapter.cpp | 3 +- .../demodnfm/nfmdemodwebapiadapter.h | 20 +----- plugins/channelrx/demodnfm/nfmplugin.cpp | 2 +- plugins/channelrx/demodnfm/nfmplugin.h | 2 +- .../demodssb/ssbdemodwebapiadapter.cpp | 3 +- .../demodssb/ssbdemodwebapiadapter.h | 20 +----- plugins/channelrx/demodssb/ssbplugin.cpp | 2 +- plugins/channelrx/demodssb/ssbplugin.h | 2 +- .../demodwfm/wfmdemodwebapiadapter.cpp | 3 +- .../demodwfm/wfmdemodwebapiadapter.h | 20 +----- plugins/channelrx/demodwfm/wfmplugin.cpp | 2 +- plugins/channelrx/demodwfm/wfmplugin.h | 2 +- .../freqtracker/freqtrackerplugin.cpp | 2 +- .../channelrx/freqtracker/freqtrackerplugin.h | 2 +- .../freqtracker/freqtrackerwebapiadapter.cpp | 3 +- .../freqtracker/freqtrackerwebapiadapter.h | 20 +----- .../channelrx/localsink/localsinkplugin.cpp | 2 +- plugins/channelrx/localsink/localsinkplugin.h | 2 +- .../localsink/localsinkwebapiadapter.cpp | 3 +- .../localsink/localsinkwebapiadapter.h | 20 +----- .../channelrx/remotesink/remotesinkplugin.cpp | 2 +- .../channelrx/remotesink/remotesinkplugin.h | 2 +- .../remotesink/remotesinkwebapiadapter.cpp | 3 +- .../remotesink/remotesinkwebapiadapter.h | 20 +----- plugins/channelrx/udpsink/udpsinkplugin.cpp | 2 +- plugins/channelrx/udpsink/udpsinkplugin.h | 2 +- .../udpsink/udpsinkwebapiadapter.cpp | 3 +- .../channelrx/udpsink/udpsinkwebapiadapter.h | 20 +----- .../channeltx/filesource/filesourceplugin.cpp | 2 +- .../channeltx/filesource/filesourceplugin.h | 2 +- .../filesource/filesourcewebapiadapter.cpp | 3 +- .../filesource/filesourcewebapiadapter.h | 20 +----- .../localsource/localsourceplugin.cpp | 2 +- .../channeltx/localsource/localsourceplugin.h | 2 +- .../localsource/localsourcewebapiadapter.cpp | 3 +- .../localsource/localsourcewebapiadapter.h | 20 +----- plugins/channeltx/modam/ammodplugin.cpp | 2 +- plugins/channeltx/modam/ammodplugin.h | 2 +- .../channeltx/modam/ammodwebapiadapter.cpp | 3 +- plugins/channeltx/modam/ammodwebapiadapter.h | 20 +----- plugins/channeltx/modatv/atvmodplugin.cpp | 2 +- plugins/channeltx/modatv/atvmodplugin.h | 2 +- .../channeltx/modatv/atvmodwebapiadapter.cpp | 3 +- .../channeltx/modatv/atvmodwebapiadapter.h | 20 +----- .../channeltx/modfreedv/freedvmodplugin.cpp | 2 +- plugins/channeltx/modfreedv/freedvmodplugin.h | 2 +- .../modfreedv/freedvmodwebapiadapter.cpp | 3 +- .../modfreedv/freedvmodwebapiadapter.h | 20 +----- plugins/channeltx/modnfm/nfmmodplugin.cpp | 2 +- plugins/channeltx/modnfm/nfmmodplugin.h | 2 +- .../channeltx/modnfm/nfmmodwebapiadapter.cpp | 3 +- .../channeltx/modnfm/nfmmodwebapiadapter.h | 20 +----- plugins/channeltx/modssb/ssbmodplugin.cpp | 2 +- plugins/channeltx/modssb/ssbmodplugin.h | 2 +- .../channeltx/modssb/ssbmodwebapiadapter.cpp | 3 +- .../channeltx/modssb/ssbmodwebapiadapter.h | 4 +- plugins/channeltx/modwfm/wfmmodplugin.cpp | 2 +- plugins/channeltx/modwfm/wfmmodplugin.h | 2 +- .../channeltx/modwfm/wfmmodwebapiadapter.cpp | 3 +- .../channeltx/modwfm/wfmmodwebapiadapter.h | 20 +----- .../remotesource/remotesourceplugin.cpp | 2 +- .../remotesource/remotesourceplugin.h | 2 +- .../remotesourcewebapiadapter.cpp | 3 +- .../remotesource/remotesourcewebapiadapter.h | 20 +----- .../channeltx/udpsource/udpsourceplugin.cpp | 2 +- plugins/channeltx/udpsource/udpsourceplugin.h | 2 +- .../udpsource/udpsourcewebapiadapter.cpp | 3 +- .../udpsource/udpsourcewebapiadapter.h | 20 +----- plugins/samplesource/rtlsdr/rtlsdrinput.cpp | 1 - sdrbase/channel/channelwebapiadapter.h | 69 +++++++++++++++++++ sdrbase/plugin/plugininterface.h | 3 +- sdrbase/webapi/webapiadapterbase.cpp | 12 ++-- sdrbase/webapi/webapiadapterbase.h | 6 +- 89 files changed, 209 insertions(+), 461 deletions(-) create mode 100644 sdrbase/channel/channelwebapiadapter.h diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index 15d5311a8..567c0361f 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -60,7 +60,7 @@ ChannelAPI* AMDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new AMDemod(deviceAPI); } -ChannelAPI* AMDemodPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* AMDemodPlugin::createChannelWebAPIAdapter() const { return new AMDemodWebAPIAdapter(); } \ No newline at end of file diff --git a/plugins/channelrx/demodam/amdemodplugin.h b/plugins/channelrx/demodam/amdemodplugin.h index 9639cceb7..565d9da44 100644 --- a/plugins/channelrx/demodam/amdemodplugin.h +++ b/plugins/channelrx/demodam/amdemodplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodam/amdemodwebapiadapter.cpp b/plugins/channelrx/demodam/amdemodwebapiadapter.cpp index 5e53d6fe8..580cd7d72 100644 --- a/plugins/channelrx/demodam/amdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodam/amdemodwebapiadapter.cpp @@ -19,13 +19,22 @@ #include "amdemod.h" #include "amdemodwebapiadapter.h" -AMDemodWebAPIAdapter::AMDemodWebAPIAdapter() : - ChannelAPI(AMDemod::m_channelIdURI, ChannelAPI::StreamSingleSink) +AMDemodWebAPIAdapter::AMDemodWebAPIAdapter() {} AMDemodWebAPIAdapter::~AMDemodWebAPIAdapter() {} +QByteArray AMDemodWebAPIAdapter::serialize() const +{ + return m_settings.serialize(); +} + +bool AMDemodWebAPIAdapter::deserialize(const QByteArray& data) +{ + return m_settings.deserialize(data); +} + int AMDemodWebAPIAdapter::webapiSettingsGet( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) diff --git a/plugins/channelrx/demodam/amdemodwebapiadapter.h b/plugins/channelrx/demodam/amdemodwebapiadapter.h index 9447a80d9..c90b00e8e 100644 --- a/plugins/channelrx/demodam/amdemodwebapiadapter.h +++ b/plugins/channelrx/demodam/amdemodwebapiadapter.h @@ -18,35 +18,19 @@ #ifndef INCLUDE_AMDEMOD_WEBAPIADAPTER_H #define INCLUDE_AMDEMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "amdemodsettings.h" /** * Standalone API adapter only for the settings */ -class AMDemodWebAPIAdapter : public ChannelAPI { +class AMDemodWebAPIAdapter : public ChannelWebAPIAdapter { public: AMDemodWebAPIAdapter(); virtual ~AMDemodWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented - virtual QByteArray serialize() const { return m_settings.serialize(); } - virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } + virtual QByteArray serialize() const; + virtual bool deserialize(const QByteArray& data); virtual int webapiSettingsGet( SWGSDRangel::SWGChannelSettings& response, diff --git a/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp b/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp index 59c5dd3be..7e27a8a14 100644 --- a/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "bfmdemod.h" #include "bfmdemodwebapiadapter.h" -BFMDemodWebAPIAdapter::BFMDemodWebAPIAdapter() : - ChannelAPI(BFMDemod::m_channelIdURI, ChannelAPI::StreamSingleSink) +BFMDemodWebAPIAdapter::BFMDemodWebAPIAdapter() {} BFMDemodWebAPIAdapter::~BFMDemodWebAPIAdapter() diff --git a/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h b/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h index e8319d12c..50a14167e 100644 --- a/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h +++ b/plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_BFMDEMOD_WEBAPIADAPTER_H #define INCLUDE_BFMDEMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "bfmdemodsettings.h" /** * Standalone API adapter only for the settings */ -class BFMDemodWebAPIAdapter : public ChannelAPI { +class BFMDemodWebAPIAdapter : public ChannelWebAPIAdapter { public: BFMDemodWebAPIAdapter(); virtual ~BFMDemodWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index 73e0f92dc..97b14b9b0 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -80,7 +80,7 @@ ChannelAPI* BFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new BFMDemod(deviceAPI); } -ChannelAPI* BFMPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* BFMPlugin::createChannelWebAPIAdapter() const { return new BFMDemodWebAPIAdapter(); } diff --git a/plugins/channelrx/demodbfm/bfmplugin.h b/plugins/channelrx/demodbfm/bfmplugin.h index c1af86ad6..e6f9cc27b 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.h +++ b/plugins/channelrx/demodbfm/bfmplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index 0b7190492..832b823e0 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -79,7 +79,7 @@ ChannelAPI* DSDDemodPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new DSDDemod(deviceAPI); } -ChannelAPI* DSDDemodPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* DSDDemodPlugin::createChannelWebAPIAdapter() const { return new DSDDemodWebAPIAdapter(); } diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.h b/plugins/channelrx/demoddsd/dsddemodplugin.h index 00dd536ae..92af82999 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.h +++ b/plugins/channelrx/demoddsd/dsddemodplugin.h @@ -39,7 +39,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp index 847784c3c..234da7c32 100644 --- a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp +++ b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp @@ -19,13 +19,22 @@ #include "dsddemod.h" #include "dsddemodwebapiadapter.h" -DSDDemodWebAPIAdapter::DSDDemodWebAPIAdapter() : - ChannelAPI(DSDDemod::m_channelIdURI, ChannelAPI::StreamSingleSink) +DSDDemodWebAPIAdapter::DSDDemodWebAPIAdapter() {} DSDDemodWebAPIAdapter::~DSDDemodWebAPIAdapter() {} +QByteArray DSDDemodWebAPIAdapter::serialize() const +{ + return m_settings.serialize(); +} + +bool DSDDemodWebAPIAdapter::deserialize(const QByteArray& data) +{ + return m_settings.deserialize(data); +} + int DSDDemodWebAPIAdapter::webapiSettingsGet( SWGSDRangel::SWGChannelSettings& response, QString& errorMessage) diff --git a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.h b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.h index 747d55a8d..b892f33a5 100644 --- a/plugins/channelrx/demoddsd/dsddemodwebapiadapter.h +++ b/plugins/channelrx/demoddsd/dsddemodwebapiadapter.h @@ -18,35 +18,19 @@ #ifndef INCLUDE_DSDDEMOD_WEBAPIADAPTER_H #define INCLUDE_DSDDEMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "dsddemodsettings.h" /** * Standalone API adapter only for the settings */ -class DSDDemodWebAPIAdapter : public ChannelAPI { +class DSDDemodWebAPIAdapter : public ChannelWebAPIAdapter { public: DSDDemodWebAPIAdapter(); virtual ~DSDDemodWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented - virtual QByteArray serialize() const { return m_settings.serialize(); } - virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } + virtual QByteArray serialize() const; + virtual bool deserialize(const QByteArray& data); virtual int webapiSettingsGet( SWGSDRangel::SWGChannelSettings& response, diff --git a/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp b/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp index e92549f4a..862694cc9 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "freedvdemod.h" #include "freedvdemodwebapiadapter.h" -FreeDVDemodWebAPIAdapter::FreeDVDemodWebAPIAdapter() : - ChannelAPI(FreeDVDemod::m_channelIdURI, ChannelAPI::StreamSingleSink) +FreeDVDemodWebAPIAdapter::FreeDVDemodWebAPIAdapter() {} FreeDVDemodWebAPIAdapter::~FreeDVDemodWebAPIAdapter() diff --git a/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h b/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h index 9c54f562d..6ae4e1cba 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h +++ b/plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_FREEDVDEMOD_WEBAPIADAPTER_H #define INCLUDE_FREEDVDEMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "freedvdemodsettings.h" /** * Standalone API adapter only for the settings */ -class FreeDVDemodWebAPIAdapter : public ChannelAPI { +class FreeDVDemodWebAPIAdapter : public ChannelWebAPIAdapter { public: FreeDVDemodWebAPIAdapter(); virtual ~FreeDVDemodWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channelrx/demodfreedv/freedvplugin.cpp b/plugins/channelrx/demodfreedv/freedvplugin.cpp index cf3e4d70d..e9ffabe44 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.cpp +++ b/plugins/channelrx/demodfreedv/freedvplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* FreeDVPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new FreeDVDemod(deviceAPI); } -ChannelAPI* FreeDVPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* FreeDVPlugin::createChannelWebAPIAdapter() const { return new FreeDVDemodWebAPIAdapter(); } diff --git a/plugins/channelrx/demodfreedv/freedvplugin.h b/plugins/channelrx/demodfreedv/freedvplugin.h index b830bcde9..ca27253f5 100644 --- a/plugins/channelrx/demodfreedv/freedvplugin.h +++ b/plugins/channelrx/demodfreedv/freedvplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp b/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp index 3b64df534..4630b4e67 100644 --- a/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "nfmdemod.h" #include "nfmdemodwebapiadapter.h" -NFMDemodWebAPIAdapter::NFMDemodWebAPIAdapter() : - ChannelAPI(NFMDemod::m_channelIdURI, ChannelAPI::StreamSingleSink) +NFMDemodWebAPIAdapter::NFMDemodWebAPIAdapter() {} NFMDemodWebAPIAdapter::~NFMDemodWebAPIAdapter() diff --git a/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h b/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h index 121a35067..b13f202a7 100644 --- a/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h +++ b/plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_NFMDEMOD_WEBAPIADAPTER_H #define INCLUDE_NFMDEMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "nfmdemodsettings.h" /** * Standalone API adapter only for the settings */ -class NFMDemodWebAPIAdapter : public ChannelAPI { +class NFMDemodWebAPIAdapter : public ChannelWebAPIAdapter { public: NFMDemodWebAPIAdapter(); virtual ~NFMDemodWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index b62ad0ad3..d4238a433 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -61,7 +61,7 @@ ChannelAPI* NFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new NFMDemod(deviceAPI); } -ChannelAPI* NFMPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* NFMPlugin::createChannelWebAPIAdapter() const { return new NFMDemodWebAPIAdapter(); } diff --git a/plugins/channelrx/demodnfm/nfmplugin.h b/plugins/channelrx/demodnfm/nfmplugin.h index 2e711d057..c3bfce879 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.h +++ b/plugins/channelrx/demodnfm/nfmplugin.h @@ -21,7 +21,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp b/plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp index 405d5fb63..2afd2b9fd 100644 --- a/plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "ssbdemod.h" #include "ssbdemodwebapiadapter.h" -SSBDemodWebAPIAdapter::SSBDemodWebAPIAdapter() : - ChannelAPI(SSBDemod::m_channelIdURI, ChannelAPI::StreamSingleSink) +SSBDemodWebAPIAdapter::SSBDemodWebAPIAdapter() {} SSBDemodWebAPIAdapter::~SSBDemodWebAPIAdapter() diff --git a/plugins/channelrx/demodssb/ssbdemodwebapiadapter.h b/plugins/channelrx/demodssb/ssbdemodwebapiadapter.h index 399bd8b5a..ccbc4ba87 100644 --- a/plugins/channelrx/demodssb/ssbdemodwebapiadapter.h +++ b/plugins/channelrx/demodssb/ssbdemodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_SSBDEMOD_WEBAPIADAPTER_H #define INCLUDE_SSBDEMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "ssbdemodsettings.h" /** * Standalone API adapter only for the settings */ -class SSBDemodWebAPIAdapter : public ChannelAPI { +class SSBDemodWebAPIAdapter : public ChannelWebAPIAdapter { public: SSBDemodWebAPIAdapter(); virtual ~SSBDemodWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index 139e1355c..867829675 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -61,7 +61,7 @@ ChannelAPI* SSBPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new SSBDemod(deviceAPI); } -ChannelAPI* SSBPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* SSBPlugin::createChannelWebAPIAdapter() const { return new SSBDemodWebAPIAdapter(); } diff --git a/plugins/channelrx/demodssb/ssbplugin.h b/plugins/channelrx/demodssb/ssbplugin.h index 10024fe46..c7eedca79 100644 --- a/plugins/channelrx/demodssb/ssbplugin.h +++ b/plugins/channelrx/demodssb/ssbplugin.h @@ -21,7 +21,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp b/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp index b3a0b86f5..a1657e446 100644 --- a/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "wfmdemod.h" #include "wfmdemodwebapiadapter.h" -WFMDemodWebAPIAdapter::WFMDemodWebAPIAdapter() : - ChannelAPI(WFMDemod::m_channelIdURI, ChannelAPI::StreamSingleSink) +WFMDemodWebAPIAdapter::WFMDemodWebAPIAdapter() {} WFMDemodWebAPIAdapter::~WFMDemodWebAPIAdapter() diff --git a/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h b/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h index 46542c016..ef9d4dc3f 100644 --- a/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h +++ b/plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_WFMDEMOD_WEBAPIADAPTER_H #define INCLUDE_WFMDEMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "wfmdemodsettings.h" /** * Standalone API adapter only for the settings */ -class WFMDemodWebAPIAdapter : public ChannelAPI { +class WFMDemodWebAPIAdapter : public ChannelWebAPIAdapter { public: WFMDemodWebAPIAdapter(); virtual ~WFMDemodWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index b130da2c7..9882652a0 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -62,7 +62,7 @@ ChannelAPI* WFMPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new WFMDemod(deviceAPI); } -ChannelAPI* WFMPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* WFMPlugin::createChannelWebAPIAdapter() const { return new WFMDemodWebAPIAdapter(); } diff --git a/plugins/channelrx/demodwfm/wfmplugin.h b/plugins/channelrx/demodwfm/wfmplugin.h index aff6a7ce1..ee27c0870 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.h +++ b/plugins/channelrx/demodwfm/wfmplugin.h @@ -21,7 +21,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp index 09cfe70c0..bd598fd75 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* FreqTrackerPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new FreqTracker(deviceAPI); } -ChannelAPI* FreqTrackerPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* FreqTrackerPlugin::createChannelWebAPIAdapter() const { return new FreqTrackerWebAPIAdapter(); } diff --git a/plugins/channelrx/freqtracker/freqtrackerplugin.h b/plugins/channelrx/freqtracker/freqtrackerplugin.h index ef4301455..cae785aa6 100644 --- a/plugins/channelrx/freqtracker/freqtrackerplugin.h +++ b/plugins/channelrx/freqtracker/freqtrackerplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp b/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp index de5678274..1f2a77ff1 100644 --- a/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp +++ b/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "freqtracker.h" #include "freqtrackerwebapiadapter.h" -FreqTrackerWebAPIAdapter::FreqTrackerWebAPIAdapter() : - ChannelAPI(FreqTracker::m_channelIdURI, ChannelAPI::StreamSingleSink) +FreqTrackerWebAPIAdapter::FreqTrackerWebAPIAdapter() {} FreqTrackerWebAPIAdapter::~FreqTrackerWebAPIAdapter() diff --git a/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h b/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h index 1da874f0e..75ee48080 100644 --- a/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h +++ b/plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_FREQTRACKER_WEBAPIADAPTER_H #define INCLUDE_FREQTRACKER_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "freqtrackersettings.h" /** * Standalone API adapter only for the settings */ -class FreqTrackerWebAPIAdapter : public ChannelAPI { +class FreqTrackerWebAPIAdapter : public ChannelWebAPIAdapter { public: FreqTrackerWebAPIAdapter(); virtual ~FreqTrackerWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channelrx/localsink/localsinkplugin.cpp b/plugins/channelrx/localsink/localsinkplugin.cpp index 01cf9e408..9e54a5038 100644 --- a/plugins/channelrx/localsink/localsinkplugin.cpp +++ b/plugins/channelrx/localsink/localsinkplugin.cpp @@ -79,7 +79,7 @@ ChannelAPI* LocalSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new LocalSink(deviceAPI); } -ChannelAPI* LocalSinkPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* LocalSinkPlugin::createChannelWebAPIAdapter() const { return new LocalSinkWebAPIAdapter(); } diff --git a/plugins/channelrx/localsink/localsinkplugin.h b/plugins/channelrx/localsink/localsinkplugin.h index 81b579aa5..10c1cb9b9 100644 --- a/plugins/channelrx/localsink/localsinkplugin.h +++ b/plugins/channelrx/localsink/localsinkplugin.h @@ -39,7 +39,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/localsink/localsinkwebapiadapter.cpp b/plugins/channelrx/localsink/localsinkwebapiadapter.cpp index cd7043f03..63e784e8a 100644 --- a/plugins/channelrx/localsink/localsinkwebapiadapter.cpp +++ b/plugins/channelrx/localsink/localsinkwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "localsink.h" #include "localsinkwebapiadapter.h" -LocalSinkWebAPIAdapter::LocalSinkWebAPIAdapter() : - ChannelAPI(LocalSink::m_channelIdURI, ChannelAPI::StreamSingleSink) +LocalSinkWebAPIAdapter::LocalSinkWebAPIAdapter() {} LocalSinkWebAPIAdapter::~LocalSinkWebAPIAdapter() diff --git a/plugins/channelrx/localsink/localsinkwebapiadapter.h b/plugins/channelrx/localsink/localsinkwebapiadapter.h index b8f619046..d3f752769 100644 --- a/plugins/channelrx/localsink/localsinkwebapiadapter.h +++ b/plugins/channelrx/localsink/localsinkwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_LOCALSINK_WEBAPIADAPTER_H #define INCLUDE_LOCALSINK_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "localsinksettings.h" /** * Standalone API adapter only for the settings */ -class LocalSinkWebAPIAdapter : public ChannelAPI { +class LocalSinkWebAPIAdapter : public ChannelWebAPIAdapter { public: LocalSinkWebAPIAdapter(); virtual ~LocalSinkWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channelrx/remotesink/remotesinkplugin.cpp b/plugins/channelrx/remotesink/remotesinkplugin.cpp index 101c4bb90..e23bd951d 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.cpp +++ b/plugins/channelrx/remotesink/remotesinkplugin.cpp @@ -79,7 +79,7 @@ ChannelAPI* RemoteSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new RemoteSink(deviceAPI); } -ChannelAPI* RemoteSinkPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* RemoteSinkPlugin::createChannelWebAPIAdapter() const { return new RemoteSinkWebAPIAdapter(); } diff --git a/plugins/channelrx/remotesink/remotesinkplugin.h b/plugins/channelrx/remotesink/remotesinkplugin.h index 4e71514f8..cd3ea2465 100644 --- a/plugins/channelrx/remotesink/remotesinkplugin.h +++ b/plugins/channelrx/remotesink/remotesinkplugin.h @@ -39,7 +39,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp b/plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp index 41d55b389..97242d201 100644 --- a/plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp +++ b/plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "remotesink.h" #include "remotesinkwebapiadapter.h" -RemoteSinkWebAPIAdapter::RemoteSinkWebAPIAdapter() : - ChannelAPI(RemoteSink::m_channelIdURI, ChannelAPI::StreamSingleSink) +RemoteSinkWebAPIAdapter::RemoteSinkWebAPIAdapter() {} RemoteSinkWebAPIAdapter::~RemoteSinkWebAPIAdapter() diff --git a/plugins/channelrx/remotesink/remotesinkwebapiadapter.h b/plugins/channelrx/remotesink/remotesinkwebapiadapter.h index b4e870d29..1e3010988 100644 --- a/plugins/channelrx/remotesink/remotesinkwebapiadapter.h +++ b/plugins/channelrx/remotesink/remotesinkwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_REMOTESINK_WEBAPIADAPTER_H #define INCLUDE_REMOTESINK_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "remotesinksettings.h" /** * Standalone API adapter only for the settings */ -class RemoteSinkWebAPIAdapter : public ChannelAPI { +class RemoteSinkWebAPIAdapter : public ChannelWebAPIAdapter { public: RemoteSinkWebAPIAdapter(); virtual ~RemoteSinkWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channelrx/udpsink/udpsinkplugin.cpp b/plugins/channelrx/udpsink/udpsinkplugin.cpp index 02e597b7d..07df3ea6b 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.cpp +++ b/plugins/channelrx/udpsink/udpsinkplugin.cpp @@ -78,7 +78,7 @@ ChannelAPI* UDPSinkPlugin::createRxChannelCS(DeviceAPI *deviceAPI) const return new UDPSink(deviceAPI); } -ChannelAPI* UDPSinkPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* UDPSinkPlugin::createChannelWebAPIAdapter() const { return new UDPSinkWebAPIAdapter(); } diff --git a/plugins/channelrx/udpsink/udpsinkplugin.h b/plugins/channelrx/udpsink/udpsinkplugin.h index 4172b8547..1e026e3b5 100644 --- a/plugins/channelrx/udpsink/udpsinkplugin.h +++ b/plugins/channelrx/udpsink/udpsinkplugin.h @@ -39,7 +39,7 @@ public: virtual PluginInstanceGUI* createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) const; virtual BasebandSampleSink* createRxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createRxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp b/plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp index ed22bf2f4..b5e529340 100644 --- a/plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp +++ b/plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "udpsink.h" #include "udpsinkwebapiadapter.h" -UDPSinkWebAPIAdapter::UDPSinkWebAPIAdapter() : - ChannelAPI(UDPSink::m_channelIdURI, ChannelAPI::StreamSingleSink) +UDPSinkWebAPIAdapter::UDPSinkWebAPIAdapter() {} UDPSinkWebAPIAdapter::~UDPSinkWebAPIAdapter() diff --git a/plugins/channelrx/udpsink/udpsinkwebapiadapter.h b/plugins/channelrx/udpsink/udpsinkwebapiadapter.h index 2d7098374..90eaf772a 100644 --- a/plugins/channelrx/udpsink/udpsinkwebapiadapter.h +++ b/plugins/channelrx/udpsink/udpsinkwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_UDPSINK_WEBAPIADAPTER_H #define INCLUDE_UDPSINK_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "udpsinksettings.h" /** * Standalone API adapter only for the settings */ -class UDPSinkWebAPIAdapter : public ChannelAPI { +class UDPSinkWebAPIAdapter : public ChannelWebAPIAdapter { public: UDPSinkWebAPIAdapter(); virtual ~UDPSinkWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/filesource/filesourceplugin.cpp b/plugins/channeltx/filesource/filesourceplugin.cpp index 3eb7de6a3..8ae86bb42 100644 --- a/plugins/channeltx/filesource/filesourceplugin.cpp +++ b/plugins/channeltx/filesource/filesourceplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* FileSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new FileSource(deviceAPI); } -ChannelAPI* FileSourcePlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* FileSourcePlugin::createChannelWebAPIAdapter() const { return new FileSourceWebAPIAdapter(); } diff --git a/plugins/channeltx/filesource/filesourceplugin.h b/plugins/channeltx/filesource/filesourceplugin.h index 1a6b1d166..f2fa7d310 100644 --- a/plugins/channeltx/filesource/filesourceplugin.h +++ b/plugins/channeltx/filesource/filesourceplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/filesource/filesourcewebapiadapter.cpp b/plugins/channeltx/filesource/filesourcewebapiadapter.cpp index b76f1d60b..eac2188ed 100644 --- a/plugins/channeltx/filesource/filesourcewebapiadapter.cpp +++ b/plugins/channeltx/filesource/filesourcewebapiadapter.cpp @@ -19,8 +19,7 @@ #include "filesource.h" #include "filesourcewebapiadapter.h" -FileSourceWebAPIAdapter::FileSourceWebAPIAdapter() : - ChannelAPI(FileSource::m_channelIdURI, ChannelAPI::StreamSingleSource) +FileSourceWebAPIAdapter::FileSourceWebAPIAdapter() {} FileSourceWebAPIAdapter::~FileSourceWebAPIAdapter() diff --git a/plugins/channeltx/filesource/filesourcewebapiadapter.h b/plugins/channeltx/filesource/filesourcewebapiadapter.h index 1615c9ace..4bf2eb277 100644 --- a/plugins/channeltx/filesource/filesourcewebapiadapter.h +++ b/plugins/channeltx/filesource/filesourcewebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_FILESOURCE_WEBAPIADAPTER_H #define INCLUDE_FILESOURCE_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "filesourcesettings.h" /** * Standalone API adapter only for the settings */ -class FileSourceWebAPIAdapter : public ChannelAPI { +class FileSourceWebAPIAdapter : public ChannelWebAPIAdapter { public: FileSourceWebAPIAdapter(); virtual ~FileSourceWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/localsource/localsourceplugin.cpp b/plugins/channeltx/localsource/localsourceplugin.cpp index 400f9b0bd..c021d7c6d 100644 --- a/plugins/channeltx/localsource/localsourceplugin.cpp +++ b/plugins/channeltx/localsource/localsourceplugin.cpp @@ -79,7 +79,7 @@ ChannelAPI* LocalSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new LocalSource(deviceAPI); } -ChannelAPI* LocalSourcePlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* LocalSourcePlugin::createChannelWebAPIAdapter() const { return new LocalSourceWebAPIAdapter(); } diff --git a/plugins/channeltx/localsource/localsourceplugin.h b/plugins/channeltx/localsource/localsourceplugin.h index ef0fdcc99..4f1df9eff 100644 --- a/plugins/channeltx/localsource/localsourceplugin.h +++ b/plugins/channeltx/localsource/localsourceplugin.h @@ -39,7 +39,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/localsource/localsourcewebapiadapter.cpp b/plugins/channeltx/localsource/localsourcewebapiadapter.cpp index 34417f57c..467be944b 100644 --- a/plugins/channeltx/localsource/localsourcewebapiadapter.cpp +++ b/plugins/channeltx/localsource/localsourcewebapiadapter.cpp @@ -19,8 +19,7 @@ #include "localsource.h" #include "localsourcewebapiadapter.h" -LocalSourceWebAPIAdapter::LocalSourceWebAPIAdapter() : - ChannelAPI(LocalSource::m_channelIdURI, ChannelAPI::StreamSingleSource) +LocalSourceWebAPIAdapter::LocalSourceWebAPIAdapter() {} LocalSourceWebAPIAdapter::~LocalSourceWebAPIAdapter() diff --git a/plugins/channeltx/localsource/localsourcewebapiadapter.h b/plugins/channeltx/localsource/localsourcewebapiadapter.h index ec5e84ac2..92b937fe6 100644 --- a/plugins/channeltx/localsource/localsourcewebapiadapter.h +++ b/plugins/channeltx/localsource/localsourcewebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_LOCALSOURCE_WEBAPIADAPTER_H #define INCLUDE_LOCALSOURCE_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "localsourcesettings.h" /** * Standalone API adapter only for the settings */ -class LocalSourceWebAPIAdapter : public ChannelAPI { +class LocalSourceWebAPIAdapter : public ChannelWebAPIAdapter { public: LocalSourceWebAPIAdapter(); virtual ~LocalSourceWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index 3423154e3..7f73a29df 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* AMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new AMMod(deviceAPI); } -ChannelAPI* AMModPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* AMModPlugin::createChannelWebAPIAdapter() const { return new AMModWebAPIAdapter(); } diff --git a/plugins/channeltx/modam/ammodplugin.h b/plugins/channeltx/modam/ammodplugin.h index ab225862d..21e09d763 100644 --- a/plugins/channeltx/modam/ammodplugin.h +++ b/plugins/channeltx/modam/ammodplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modam/ammodwebapiadapter.cpp b/plugins/channeltx/modam/ammodwebapiadapter.cpp index a640a4ddf..0a954cb85 100644 --- a/plugins/channeltx/modam/ammodwebapiadapter.cpp +++ b/plugins/channeltx/modam/ammodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "ammod.h" #include "ammodwebapiadapter.h" -AMModWebAPIAdapter::AMModWebAPIAdapter() : - ChannelAPI(AMMod::m_channelIdURI, ChannelAPI::StreamSingleSource) +AMModWebAPIAdapter::AMModWebAPIAdapter() {} AMModWebAPIAdapter::~AMModWebAPIAdapter() diff --git a/plugins/channeltx/modam/ammodwebapiadapter.h b/plugins/channeltx/modam/ammodwebapiadapter.h index e56a01f50..a095de8c5 100644 --- a/plugins/channeltx/modam/ammodwebapiadapter.h +++ b/plugins/channeltx/modam/ammodwebapiadapter.h @@ -18,34 +18,18 @@ #ifndef INCLUDE_AMMOD_WEBAPIADAPTER_H #define INCLUDE_AMMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "dsp/cwkeyersettings.h" #include "ammodsettings.h" /** * Standalone API adapter only for the settings */ -class AMModWebAPIAdapter : public ChannelAPI { +class AMModWebAPIAdapter : public ChannelWebAPIAdapter { public: AMModWebAPIAdapter(); virtual ~AMModWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index 2d876cfb7..4ca13b678 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* ATVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new ATVMod(deviceAPI); } -ChannelAPI* ATVModPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* ATVModPlugin::createChannelWebAPIAdapter() const { return new ATVModWebAPIAdapter(); } diff --git a/plugins/channeltx/modatv/atvmodplugin.h b/plugins/channeltx/modatv/atvmodplugin.h index fc78c26fe..5a386e9be 100644 --- a/plugins/channeltx/modatv/atvmodplugin.h +++ b/plugins/channeltx/modatv/atvmodplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modatv/atvmodwebapiadapter.cpp b/plugins/channeltx/modatv/atvmodwebapiadapter.cpp index 7fe2ea355..f5b65a3a2 100644 --- a/plugins/channeltx/modatv/atvmodwebapiadapter.cpp +++ b/plugins/channeltx/modatv/atvmodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "atvmod.h" #include "atvmodwebapiadapter.h" -ATVModWebAPIAdapter::ATVModWebAPIAdapter() : - ChannelAPI(ATVMod::m_channelIdURI, ChannelAPI::StreamSingleSource) +ATVModWebAPIAdapter::ATVModWebAPIAdapter() {} ATVModWebAPIAdapter::~ATVModWebAPIAdapter() diff --git a/plugins/channeltx/modatv/atvmodwebapiadapter.h b/plugins/channeltx/modatv/atvmodwebapiadapter.h index 4e4829164..2f544a986 100644 --- a/plugins/channeltx/modatv/atvmodwebapiadapter.h +++ b/plugins/channeltx/modatv/atvmodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_ATVMOD_WEBAPIADAPTER_H #define INCLUDE_ATVMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "atvmodsettings.h" /** * Standalone API adapter only for the settings */ -class ATVModWebAPIAdapter : public ChannelAPI { +class ATVModWebAPIAdapter : public ChannelWebAPIAdapter { public: ATVModWebAPIAdapter(); virtual ~ATVModWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.cpp b/plugins/channeltx/modfreedv/freedvmodplugin.cpp index b31daafa9..9e5e5fec1 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.cpp +++ b/plugins/channeltx/modfreedv/freedvmodplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* FreeDVModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new FreeDVMod(deviceAPI); } -ChannelAPI* FreeDVModPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* FreeDVModPlugin::createChannelWebAPIAdapter() const { return new FreeDVModWebAPIAdapter(); } diff --git a/plugins/channeltx/modfreedv/freedvmodplugin.h b/plugins/channeltx/modfreedv/freedvmodplugin.h index 30e71a0ac..6b5e9d946 100644 --- a/plugins/channeltx/modfreedv/freedvmodplugin.h +++ b/plugins/channeltx/modfreedv/freedvmodplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp b/plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp index cdd60a4f2..0f9e81b22 100644 --- a/plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp +++ b/plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "freedvmod.h" #include "freedvmodwebapiadapter.h" -FreeDVModWebAPIAdapter::FreeDVModWebAPIAdapter() : - ChannelAPI(FreeDVMod::m_channelIdURI, ChannelAPI::StreamSingleSource) +FreeDVModWebAPIAdapter::FreeDVModWebAPIAdapter() {} FreeDVModWebAPIAdapter::~FreeDVModWebAPIAdapter() diff --git a/plugins/channeltx/modfreedv/freedvmodwebapiadapter.h b/plugins/channeltx/modfreedv/freedvmodwebapiadapter.h index 7472e5ebb..676cc8d58 100644 --- a/plugins/channeltx/modfreedv/freedvmodwebapiadapter.h +++ b/plugins/channeltx/modfreedv/freedvmodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_FREEDVMOD_WEBAPIADAPTER_H #define INCLUDE_FREEDVMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "freedvmodsettings.h" /** * Standalone API adapter only for the settings */ -class FreeDVModWebAPIAdapter : public ChannelAPI { +class FreeDVModWebAPIAdapter : public ChannelWebAPIAdapter { public: FreeDVModWebAPIAdapter(); virtual ~FreeDVModWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index 550491d2b..7ae2d4666 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* NFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new NFMMod(deviceAPI); } -ChannelAPI* NFMModPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* NFMModPlugin::createChannelWebAPIAdapter() const { return new NFMModWebAPIAdapter(); } diff --git a/plugins/channeltx/modnfm/nfmmodplugin.h b/plugins/channeltx/modnfm/nfmmodplugin.h index 9bbe97ccb..7ff58e204 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.h +++ b/plugins/channeltx/modnfm/nfmmodplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *rxChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp b/plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp index 06722ab43..f2b303fc8 100644 --- a/plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp +++ b/plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "nfmmod.h" #include "nfmmodwebapiadapter.h" -NFMModWebAPIAdapter::NFMModWebAPIAdapter() : - ChannelAPI(NFMMod::m_channelIdURI, ChannelAPI::StreamSingleSource) +NFMModWebAPIAdapter::NFMModWebAPIAdapter() {} NFMModWebAPIAdapter::~NFMModWebAPIAdapter() diff --git a/plugins/channeltx/modnfm/nfmmodwebapiadapter.h b/plugins/channeltx/modnfm/nfmmodwebapiadapter.h index 3178eef81..63d1ef0ee 100644 --- a/plugins/channeltx/modnfm/nfmmodwebapiadapter.h +++ b/plugins/channeltx/modnfm/nfmmodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_NFMMOD_WEBAPIADAPTER_H #define INCLUDE_NFMMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "nfmmodsettings.h" /** * Standalone API adapter only for the settings */ -class NFMModWebAPIAdapter : public ChannelAPI { +class NFMModWebAPIAdapter : public ChannelWebAPIAdapter { public: NFMModWebAPIAdapter(); virtual ~NFMModWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index 37adaca2b..3ead9f6cf 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* SSBModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new SSBMod(deviceAPI); } -ChannelAPI* SSBModPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* SSBModPlugin::createChannelWebAPIAdapter() const { return new SSBModWebAPIAdapter(); } diff --git a/plugins/channeltx/modssb/ssbmodplugin.h b/plugins/channeltx/modssb/ssbmodplugin.h index ec002a421..7ec88f7ef 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.h +++ b/plugins/channeltx/modssb/ssbmodplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modssb/ssbmodwebapiadapter.cpp b/plugins/channeltx/modssb/ssbmodwebapiadapter.cpp index 492c8c20e..e34d72c16 100644 --- a/plugins/channeltx/modssb/ssbmodwebapiadapter.cpp +++ b/plugins/channeltx/modssb/ssbmodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "ssbmod.h" #include "ssbmodwebapiadapter.h" -SSBModWebAPIAdapter::SSBModWebAPIAdapter() : - ChannelAPI(SSBMod::m_channelIdURI, ChannelAPI::StreamSingleSource) +SSBModWebAPIAdapter::SSBModWebAPIAdapter() {} SSBModWebAPIAdapter::~SSBModWebAPIAdapter() diff --git a/plugins/channeltx/modssb/ssbmodwebapiadapter.h b/plugins/channeltx/modssb/ssbmodwebapiadapter.h index b36f941f5..25af209b4 100644 --- a/plugins/channeltx/modssb/ssbmodwebapiadapter.h +++ b/plugins/channeltx/modssb/ssbmodwebapiadapter.h @@ -18,13 +18,13 @@ #ifndef INCLUDE_SSBMOD_WEBAPIADAPTER_H #define INCLUDE_SSBMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "ssbmodsettings.h" /** * Standalone API adapter only for the settings */ -class SSBModWebAPIAdapter : public ChannelAPI { +class SSBModWebAPIAdapter : public ChannelWebAPIAdapter { public: SSBModWebAPIAdapter(); virtual ~SSBModWebAPIAdapter(); diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index e081b5c59..39d074c6b 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* WFMModPlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new WFMMod(deviceAPI); } -ChannelAPI* WFMModPlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* WFMModPlugin::createChannelWebAPIAdapter() const { return new WFMModWebAPIAdapter(); } diff --git a/plugins/channeltx/modwfm/wfmmodplugin.h b/plugins/channeltx/modwfm/wfmmodplugin.h index fb2445153..bb7dba636 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.h +++ b/plugins/channeltx/modwfm/wfmmodplugin.h @@ -37,7 +37,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp b/plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp index f910d47b9..2a0ccf0d6 100644 --- a/plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp +++ b/plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp @@ -19,8 +19,7 @@ #include "wfmmod.h" #include "wfmmodwebapiadapter.h" -WFMModWebAPIAdapter::WFMModWebAPIAdapter() : - ChannelAPI(WFMMod::m_channelIdURI, ChannelAPI::StreamSingleSource) +WFMModWebAPIAdapter::WFMModWebAPIAdapter() {} WFMModWebAPIAdapter::~WFMModWebAPIAdapter() diff --git a/plugins/channeltx/modwfm/wfmmodwebapiadapter.h b/plugins/channeltx/modwfm/wfmmodwebapiadapter.h index 0fd43538e..2bc73fddd 100644 --- a/plugins/channeltx/modwfm/wfmmodwebapiadapter.h +++ b/plugins/channeltx/modwfm/wfmmodwebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_WFMMOD_WEBAPIADAPTER_H #define INCLUDE_WFMMOD_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "wfmmodsettings.h" /** * Standalone API adapter only for the settings */ -class WFMModWebAPIAdapter : public ChannelAPI { +class WFMModWebAPIAdapter : public ChannelWebAPIAdapter { public: WFMModWebAPIAdapter(); virtual ~WFMModWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/remotesource/remotesourceplugin.cpp b/plugins/channeltx/remotesource/remotesourceplugin.cpp index f8f2ad8bd..427abf99c 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.cpp +++ b/plugins/channeltx/remotesource/remotesourceplugin.cpp @@ -77,7 +77,7 @@ ChannelAPI* RemoteSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new RemoteSource(deviceAPI); } -ChannelAPI* RemoteSourcePlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* RemoteSourcePlugin::createChannelWebAPIAdapter() const { return new RemoteSourceWebAPIAdapter(); } diff --git a/plugins/channeltx/remotesource/remotesourceplugin.h b/plugins/channeltx/remotesource/remotesourceplugin.h index 4595afac4..3cb3fad58 100644 --- a/plugins/channeltx/remotesource/remotesourceplugin.h +++ b/plugins/channeltx/remotesource/remotesourceplugin.h @@ -38,7 +38,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp b/plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp index 9ba5f977d..660be24d7 100644 --- a/plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp +++ b/plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp @@ -19,8 +19,7 @@ #include "remotesource.h" #include "remotesourcewebapiadapter.h" -RemoteSourceWebAPIAdapter::RemoteSourceWebAPIAdapter() : - ChannelAPI(RemoteSource::m_channelIdURI, ChannelAPI::StreamSingleSource) +RemoteSourceWebAPIAdapter::RemoteSourceWebAPIAdapter() {} RemoteSourceWebAPIAdapter::~RemoteSourceWebAPIAdapter() diff --git a/plugins/channeltx/remotesource/remotesourcewebapiadapter.h b/plugins/channeltx/remotesource/remotesourcewebapiadapter.h index 768d3a763..7f8bb8330 100644 --- a/plugins/channeltx/remotesource/remotesourcewebapiadapter.h +++ b/plugins/channeltx/remotesource/remotesourcewebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_REMOTESOURCE_WEBAPIADAPTER_H #define INCLUDE_REMOTESOURCE_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "remotesourcesettings.h" /** * Standalone API adapter only for the settings */ -class RemoteSourceWebAPIAdapter : public ChannelAPI { +class RemoteSourceWebAPIAdapter : public ChannelWebAPIAdapter { public: RemoteSourceWebAPIAdapter(); virtual ~RemoteSourceWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/channeltx/udpsource/udpsourceplugin.cpp b/plugins/channeltx/udpsource/udpsourceplugin.cpp index 0396e229d..a02da15a8 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.cpp +++ b/plugins/channeltx/udpsource/udpsourceplugin.cpp @@ -80,7 +80,7 @@ ChannelAPI* UDPSourcePlugin::createTxChannelCS(DeviceAPI *deviceAPI) const return new UDPSource(deviceAPI); } -ChannelAPI* UDPSourcePlugin::createChannelWebAPIAdapter() const +ChannelWebAPIAdapter* UDPSourcePlugin::createChannelWebAPIAdapter() const { return new UDPSourceWebAPIAdapter(); } diff --git a/plugins/channeltx/udpsource/udpsourceplugin.h b/plugins/channeltx/udpsource/udpsourceplugin.h index 772dee99c..03cd77055 100644 --- a/plugins/channeltx/udpsource/udpsourceplugin.h +++ b/plugins/channeltx/udpsource/udpsourceplugin.h @@ -39,7 +39,7 @@ public: virtual PluginInstanceGUI* createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel) const; virtual BasebandSampleSource* createTxChannelBS(DeviceAPI *deviceAPI) const; virtual ChannelAPI* createTxChannelCS(DeviceAPI *deviceAPI) const; - virtual ChannelAPI* createChannelWebAPIAdapter() const; + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const; private: static const PluginDescriptor m_pluginDescriptor; diff --git a/plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp b/plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp index b1905fc5e..633b1576f 100644 --- a/plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp +++ b/plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp @@ -19,8 +19,7 @@ #include "udpsource.h" #include "udpsourcewebapiadapter.h" -UDPSourceWebAPIAdapter::UDPSourceWebAPIAdapter() : - ChannelAPI(UDPSource::m_channelIdURI, ChannelAPI::StreamSingleSource) +UDPSourceWebAPIAdapter::UDPSourceWebAPIAdapter() {} UDPSourceWebAPIAdapter::~UDPSourceWebAPIAdapter() diff --git a/plugins/channeltx/udpsource/udpsourcewebapiadapter.h b/plugins/channeltx/udpsource/udpsourcewebapiadapter.h index 1919379de..d538b2048 100644 --- a/plugins/channeltx/udpsource/udpsourcewebapiadapter.h +++ b/plugins/channeltx/udpsource/udpsourcewebapiadapter.h @@ -18,33 +18,17 @@ #ifndef INCLUDE_UDPSOURCE_WEBAPIADAPTER_H #define INCLUDE_UDPSOURCE_WEBAPIADAPTER_H -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "udpsourcesettings.h" /** * Standalone API adapter only for the settings */ -class UDPSourceWebAPIAdapter : public ChannelAPI { +class UDPSourceWebAPIAdapter : public ChannelWebAPIAdapter { public: UDPSourceWebAPIAdapter(); virtual ~UDPSourceWebAPIAdapter(); - // unused pure virtual methods - virtual void destroy() {} - virtual void getIdentifier(QString& id) {} - virtual void getTitle(QString& title) {} - virtual qint64 getCenterFrequency() const { return 0; } - virtual int getNbSinkStreams() const { return 1; } - virtual int getNbSourceStreams() const { return 0; } - - virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const - { - (void) streamIndex; - (void) sinkElseSource; - return 0; - } - - // virtual methods actually implemented virtual QByteArray serialize() const { return m_settings.serialize(); } virtual bool deserialize(const QByteArray& data) { m_settings.deserialize(data); } diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index 99504a36d..d1d4b78c0 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -682,7 +682,6 @@ void RTLSDRInput::webapiUpdateDeviceSettings( void RTLSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const RTLSDRSettings& settings) { - qDebug("RTLSDRInput::webapiFormatDeviceSettings: m_lowSampleRate: %s", settings.m_lowSampleRate ? "true" : "false"); response.getRtlSdrSettings()->setAgc(settings.m_agc ? 1 : 0); response.getRtlSdrSettings()->setCenterFrequency(settings.m_centerFrequency); response.getRtlSdrSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0); diff --git a/sdrbase/channel/channelwebapiadapter.h b/sdrbase/channel/channelwebapiadapter.h new file mode 100644 index 000000000..2fd6fa175 --- /dev/null +++ b/sdrbase/channel/channelwebapiadapter.h @@ -0,0 +1,69 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2019 Edouard Griffiths, F4EXB // +// // +// Interface for static web API adapters used for preset serialization and // +// deserialization // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef SDRBASE_CHANNEL_CHANNELWEBAPIADAPER_H_ +#define SDRBASE_CHANNEL_CHANNELWEBAPIADAPER_H_ + +#include +#include + +#include "export.h" + +namespace SWGSDRangel +{ + class SWGChannelSettings; +} + +class SDRBASE_API ChannelWebAPIAdapter +{ +public: + ChannelWebAPIAdapter() {} + virtual ~ChannelWebAPIAdapter() {} + virtual QByteArray serialize() const = 0; + virtual bool deserialize(const QByteArray& data) = 0; + + /** + * API adapter for the channel settings GET requests + */ + virtual int webapiSettingsGet( + SWGSDRangel::SWGChannelSettings& response, + QString& errorMessage) + { + (void) response; + errorMessage = "Not implemented"; return 501; + } + + /** + * API adapter for the channel settings PUT and PATCH requests + */ + virtual int webapiSettingsPutPatch( + bool force, + const QStringList& channelSettingsKeys, + SWGSDRangel::SWGChannelSettings& response, + QString& errorMessage) + { + (void) force; + (void) channelSettingsKeys; + (void) response; + errorMessage = "Not implemented"; return 501; + } +}; + +#endif // SDRBASE_CHANNEL_CHANNELWEBAPIADAPER_H_ \ No newline at end of file diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index d597062af..36c4a0a4a 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -27,6 +27,7 @@ class DeviceSampleMIMO; class BasebandSampleSink; class BasebandSampleSource; class ChannelAPI; +class ChannelWebAPIAdapter; class DeviceWebAPIAdapter; class SDRBASE_API PluginInterface { @@ -133,7 +134,7 @@ public: // any channel - virtual ChannelAPI* createChannelWebAPIAdapter() const + virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const { return nullptr; } diff --git a/sdrbase/webapi/webapiadapterbase.cpp b/sdrbase/webapi/webapiadapterbase.cpp index 20077a36b..a13af09d7 100644 --- a/sdrbase/webapi/webapiadapterbase.cpp +++ b/sdrbase/webapi/webapiadapterbase.cpp @@ -18,7 +18,7 @@ /////////////////////////////////////////////////////////////////////////////////// #include "plugin/pluginmanager.h" -#include "channel/channelapi.h" +#include "channel/channelwebapiadapter.h" #include "channel/channelutils.h" #include "device/devicewebapiadapter.h" #include "device/deviceutils.h" @@ -75,7 +75,7 @@ void WebAPIAdapterBase::webapiFormatPreset( const QByteArray& channelSettings = channelConfig.m_config; SWGSDRangel::SWGChannelSettings *swgChannelSettings = swgChannelConfigs->back()->getConfig(); swgChannelSettings->init(); - ChannelAPI *channelWebAPIAdapter = m_webAPIChannelAdapters.getChannelAPI(channelConfig.m_channelIdURI, m_pluginManager); + ChannelWebAPIAdapter *channelWebAPIAdapter = m_webAPIChannelAdapters.getChannelWebAPIAdapter(channelConfig.m_channelIdURI, m_pluginManager); if (channelWebAPIAdapter) { @@ -125,10 +125,10 @@ void WebAPIAdapterBase::webapiFormatCommand( apiCommand->setRelease(command.getRelease() ? 1 : 0); } -ChannelAPI *WebAPIAdapterBase::WebAPIChannelAdapters::getChannelAPI(const QString& channelURI, const PluginManager *pluginManager) +ChannelWebAPIAdapter *WebAPIAdapterBase::WebAPIChannelAdapters::getChannelWebAPIAdapter(const QString& channelURI, const PluginManager *pluginManager) { QString registeredChannelURI = ChannelUtils::getRegisteredChannelURI(channelURI); - QMap::iterator it = m_webAPIChannelAdapters.find(registeredChannelURI); + QMap::iterator it = m_webAPIChannelAdapters.find(registeredChannelURI); if (it == m_webAPIChannelAdapters.end()) { @@ -136,7 +136,7 @@ ChannelAPI *WebAPIAdapterBase::WebAPIChannelAdapters::getChannelAPI(const QStrin if (pluginInterface) { - ChannelAPI *channelAPI = pluginInterface->createChannelWebAPIAdapter(); + ChannelWebAPIAdapter *channelAPI = pluginInterface->createChannelWebAPIAdapter(); m_webAPIChannelAdapters.insert(registeredChannelURI, channelAPI); return channelAPI; } @@ -154,7 +154,7 @@ ChannelAPI *WebAPIAdapterBase::WebAPIChannelAdapters::getChannelAPI(const QStrin void WebAPIAdapterBase::WebAPIChannelAdapters::flush() { - foreach(ChannelAPI *channelAPI, m_webAPIChannelAdapters) { + foreach(ChannelWebAPIAdapter *channelAPI, m_webAPIChannelAdapters) { delete channelAPI; } diff --git a/sdrbase/webapi/webapiadapterbase.h b/sdrbase/webapi/webapiadapterbase.h index 7a3cfd502..d25dff6d4 100644 --- a/sdrbase/webapi/webapiadapterbase.h +++ b/sdrbase/webapi/webapiadapterbase.h @@ -30,7 +30,7 @@ #include "commands/command.h" class PluginManager; -class ChannelAPI; +class ChannelWebAPIAdapter; class DeviceWebAPIAdapter; /** @@ -61,10 +61,10 @@ private: class WebAPIChannelAdapters { public: - ChannelAPI *getChannelAPI(const QString& channelURI, const PluginManager *pluginManager); + ChannelWebAPIAdapter *getChannelWebAPIAdapter(const QString& channelURI, const PluginManager *pluginManager); void flush(); private: - QMap m_webAPIChannelAdapters; + QMap m_webAPIChannelAdapters; }; class WebAPIDeviceAdapters