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

REST API: config: use specialized ChannelWebAPIAdapter class similar to what has been done for devices

This commit is contained in:
f4exb 2019-08-05 00:10:56 +02:00
parent a078239685
commit 7688f187bc
89 changed files with 209 additions and 461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
}

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

@ -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;

13
plugins/channelrx/demodam/amdemodwebapiadapter.cpp
View File

@ -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)

24
plugins/channelrx/demodam/amdemodwebapiadapter.h
View File

@ -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,

3
plugins/channelrx/demodbfm/bfmdemodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "bfmdemod.h"
#include "bfmdemodwebapiadapter.h"
BFMDemodWebAPIAdapter::BFMDemodWebAPIAdapter() :
ChannelAPI(BFMDemod::m_channelIdURI, ChannelAPI::StreamSingleSink)
BFMDemodWebAPIAdapter::BFMDemodWebAPIAdapter()
{}
BFMDemodWebAPIAdapter::~BFMDemodWebAPIAdapter()

20
plugins/channelrx/demodbfm/bfmdemodwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

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

@ -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();
}

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

@ -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;

13
plugins/channelrx/demoddsd/dsddemodwebapiadapter.cpp
View File

@ -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)

24
plugins/channelrx/demoddsd/dsddemodwebapiadapter.h
View File

@ -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,

3
plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "freedvdemod.h"
#include "freedvdemodwebapiadapter.h"
FreeDVDemodWebAPIAdapter::FreeDVDemodWebAPIAdapter() :
ChannelAPI(FreeDVDemod::m_channelIdURI, ChannelAPI::StreamSingleSink)
FreeDVDemodWebAPIAdapter::FreeDVDemodWebAPIAdapter()
{}
FreeDVDemodWebAPIAdapter::~FreeDVDemodWebAPIAdapter()

20
plugins/channelrx/demodfreedv/freedvdemodwebapiadapter.h
View File

@ -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); }

2
plugins/channelrx/demodfreedv/freedvplugin.cpp
View File

@ -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();
}

2
plugins/channelrx/demodfreedv/freedvplugin.h
View File

@ -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;

3
plugins/channelrx/demodnfm/nfmdemodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "nfmdemod.h"
#include "nfmdemodwebapiadapter.h"
NFMDemodWebAPIAdapter::NFMDemodWebAPIAdapter() :
ChannelAPI(NFMDemod::m_channelIdURI, ChannelAPI::StreamSingleSink)
NFMDemodWebAPIAdapter::NFMDemodWebAPIAdapter()
{}
NFMDemodWebAPIAdapter::~NFMDemodWebAPIAdapter()

20
plugins/channelrx/demodnfm/nfmdemodwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

3
plugins/channelrx/demodssb/ssbdemodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "ssbdemod.h"
#include "ssbdemodwebapiadapter.h"
SSBDemodWebAPIAdapter::SSBDemodWebAPIAdapter() :
ChannelAPI(SSBDemod::m_channelIdURI, ChannelAPI::StreamSingleSink)
SSBDemodWebAPIAdapter::SSBDemodWebAPIAdapter()
{}
SSBDemodWebAPIAdapter::~SSBDemodWebAPIAdapter()

20
plugins/channelrx/demodssb/ssbdemodwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

3
plugins/channelrx/demodwfm/wfmdemodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "wfmdemod.h"
#include "wfmdemodwebapiadapter.h"
WFMDemodWebAPIAdapter::WFMDemodWebAPIAdapter() :
ChannelAPI(WFMDemod::m_channelIdURI, ChannelAPI::StreamSingleSink)
WFMDemodWebAPIAdapter::WFMDemodWebAPIAdapter()
{}
WFMDemodWebAPIAdapter::~WFMDemodWebAPIAdapter()

20
plugins/channelrx/demodwfm/wfmdemodwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

2
plugins/channelrx/freqtracker/freqtrackerplugin.cpp
View File

@ -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();
}

2
plugins/channelrx/freqtracker/freqtrackerplugin.h
View File

@ -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;

3
plugins/channelrx/freqtracker/freqtrackerwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "freqtracker.h"
#include "freqtrackerwebapiadapter.h"
FreqTrackerWebAPIAdapter::FreqTrackerWebAPIAdapter() :
ChannelAPI(FreqTracker::m_channelIdURI, ChannelAPI::StreamSingleSink)
FreqTrackerWebAPIAdapter::FreqTrackerWebAPIAdapter()
{}
FreqTrackerWebAPIAdapter::~FreqTrackerWebAPIAdapter()

20
plugins/channelrx/freqtracker/freqtrackerwebapiadapter.h
View File

@ -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); }

2
plugins/channelrx/localsink/localsinkplugin.cpp
View File

@ -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();
}

2
plugins/channelrx/localsink/localsinkplugin.h
View File

@ -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;

3
plugins/channelrx/localsink/localsinkwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "localsink.h"
#include "localsinkwebapiadapter.h"
LocalSinkWebAPIAdapter::LocalSinkWebAPIAdapter() :
ChannelAPI(LocalSink::m_channelIdURI, ChannelAPI::StreamSingleSink)
LocalSinkWebAPIAdapter::LocalSinkWebAPIAdapter()
{}
LocalSinkWebAPIAdapter::~LocalSinkWebAPIAdapter()

20
plugins/channelrx/localsink/localsinkwebapiadapter.h
View File

@ -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); }

2
plugins/channelrx/remotesink/remotesinkplugin.cpp
View File

@ -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();
}

2
plugins/channelrx/remotesink/remotesinkplugin.h
View File

@ -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;

3
plugins/channelrx/remotesink/remotesinkwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "remotesink.h"
#include "remotesinkwebapiadapter.h"
RemoteSinkWebAPIAdapter::RemoteSinkWebAPIAdapter() :
ChannelAPI(RemoteSink::m_channelIdURI, ChannelAPI::StreamSingleSink)
RemoteSinkWebAPIAdapter::RemoteSinkWebAPIAdapter()
{}
RemoteSinkWebAPIAdapter::~RemoteSinkWebAPIAdapter()

20
plugins/channelrx/remotesink/remotesinkwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

3
plugins/channelrx/udpsink/udpsinkwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "udpsink.h"
#include "udpsinkwebapiadapter.h"
UDPSinkWebAPIAdapter::UDPSinkWebAPIAdapter() :
ChannelAPI(UDPSink::m_channelIdURI, ChannelAPI::StreamSingleSink)
UDPSinkWebAPIAdapter::UDPSinkWebAPIAdapter()
{}
UDPSinkWebAPIAdapter::~UDPSinkWebAPIAdapter()

20
plugins/channelrx/udpsink/udpsinkwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

3
plugins/channeltx/filesource/filesourcewebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "filesource.h"
#include "filesourcewebapiadapter.h"
FileSourceWebAPIAdapter::FileSourceWebAPIAdapter() :
ChannelAPI(FileSource::m_channelIdURI, ChannelAPI::StreamSingleSource)
FileSourceWebAPIAdapter::FileSourceWebAPIAdapter()
{}
FileSourceWebAPIAdapter::~FileSourceWebAPIAdapter()

20
plugins/channeltx/filesource/filesourcewebapiadapter.h
View File

@ -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); }

2
plugins/channeltx/localsource/localsourceplugin.cpp
View File

@ -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();
}

2
plugins/channeltx/localsource/localsourceplugin.h
View File

@ -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;

3
plugins/channeltx/localsource/localsourcewebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "localsource.h"
#include "localsourcewebapiadapter.h"
LocalSourceWebAPIAdapter::LocalSourceWebAPIAdapter() :
ChannelAPI(LocalSource::m_channelIdURI, ChannelAPI::StreamSingleSource)
LocalSourceWebAPIAdapter::LocalSourceWebAPIAdapter()
{}
LocalSourceWebAPIAdapter::~LocalSourceWebAPIAdapter()

20
plugins/channeltx/localsource/localsourcewebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

3
plugins/channeltx/modam/ammodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "ammod.h"
#include "ammodwebapiadapter.h"
AMModWebAPIAdapter::AMModWebAPIAdapter() :
ChannelAPI(AMMod::m_channelIdURI, ChannelAPI::StreamSingleSource)
AMModWebAPIAdapter::AMModWebAPIAdapter()
{}
AMModWebAPIAdapter::~AMModWebAPIAdapter()

20
plugins/channeltx/modam/ammodwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

3
plugins/channeltx/modatv/atvmodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "atvmod.h"
#include "atvmodwebapiadapter.h"
ATVModWebAPIAdapter::ATVModWebAPIAdapter() :
ChannelAPI(ATVMod::m_channelIdURI, ChannelAPI::StreamSingleSource)
ATVModWebAPIAdapter::ATVModWebAPIAdapter()
{}
ATVModWebAPIAdapter::~ATVModWebAPIAdapter()

20
plugins/channeltx/modatv/atvmodwebapiadapter.h
View File

@ -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); }

2
plugins/channeltx/modfreedv/freedvmodplugin.cpp
View File

@ -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();
}

2
plugins/channeltx/modfreedv/freedvmodplugin.h
View File

@ -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;

3
plugins/channeltx/modfreedv/freedvmodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "freedvmod.h"
#include "freedvmodwebapiadapter.h"
FreeDVModWebAPIAdapter::FreeDVModWebAPIAdapter() :
ChannelAPI(FreeDVMod::m_channelIdURI, ChannelAPI::StreamSingleSource)
FreeDVModWebAPIAdapter::FreeDVModWebAPIAdapter()
{}
FreeDVModWebAPIAdapter::~FreeDVModWebAPIAdapter()

20
plugins/channeltx/modfreedv/freedvmodwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

3
plugins/channeltx/modnfm/nfmmodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "nfmmod.h"
#include "nfmmodwebapiadapter.h"
NFMModWebAPIAdapter::NFMModWebAPIAdapter() :
ChannelAPI(NFMMod::m_channelIdURI, ChannelAPI::StreamSingleSource)
NFMModWebAPIAdapter::NFMModWebAPIAdapter()
{}
NFMModWebAPIAdapter::~NFMModWebAPIAdapter()

20
plugins/channeltx/modnfm/nfmmodwebapiadapter.h
View File

@ -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); }

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

@ -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();
}

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

@ -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;

3
plugins/channeltx/modssb/ssbmodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "ssbmod.h"
#include "ssbmodwebapiadapter.h"
SSBModWebAPIAdapter::SSBModWebAPIAdapter() :
ChannelAPI(SSBMod::m_channelIdURI, ChannelAPI::StreamSingleSource)
SSBModWebAPIAdapter::SSBModWebAPIAdapter()
{}
SSBModWebAPIAdapter::~SSBModWebAPIAdapter()

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

@ -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();

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

@ -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();
}

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

@ -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;

3
plugins/channeltx/modwfm/wfmmodwebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "wfmmod.h"
#include "wfmmodwebapiadapter.h"
WFMModWebAPIAdapter::WFMModWebAPIAdapter() :
ChannelAPI(WFMMod::m_channelIdURI, ChannelAPI::StreamSingleSource)
WFMModWebAPIAdapter::WFMModWebAPIAdapter()
{}
WFMModWebAPIAdapter::~WFMModWebAPIAdapter()

20
plugins/channeltx/modwfm/wfmmodwebapiadapter.h
View File

@ -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); }

2
plugins/channeltx/remotesource/remotesourceplugin.cpp
View File

@ -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();
}

2
plugins/channeltx/remotesource/remotesourceplugin.h
View File

@ -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;

3
plugins/channeltx/remotesource/remotesourcewebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "remotesource.h"
#include "remotesourcewebapiadapter.h"
RemoteSourceWebAPIAdapter::RemoteSourceWebAPIAdapter() :
ChannelAPI(RemoteSource::m_channelIdURI, ChannelAPI::StreamSingleSource)
RemoteSourceWebAPIAdapter::RemoteSourceWebAPIAdapter()
{}
RemoteSourceWebAPIAdapter::~RemoteSourceWebAPIAdapter()

20
plugins/channeltx/remotesource/remotesourcewebapiadapter.h
View File

@ -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); }

2
plugins/channeltx/udpsource/udpsourceplugin.cpp
View File

@ -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();
}

2
plugins/channeltx/udpsource/udpsourceplugin.h
View File

@ -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;

3
plugins/channeltx/udpsource/udpsourcewebapiadapter.cpp
View File

@ -19,8 +19,7 @@
#include "udpsource.h"
#include "udpsourcewebapiadapter.h"
UDPSourceWebAPIAdapter::UDPSourceWebAPIAdapter() :
ChannelAPI(UDPSource::m_channelIdURI, ChannelAPI::StreamSingleSource)
UDPSourceWebAPIAdapter::UDPSourceWebAPIAdapter()
{}
UDPSourceWebAPIAdapter::~UDPSourceWebAPIAdapter()

20
plugins/channeltx/udpsource/udpsourcewebapiadapter.h
View File

@ -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); }

1
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -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);

69
sdrbase/channel/channelwebapiadapter.h Normal file
View File

@ -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 <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#ifndef SDRBASE_CHANNEL_CHANNELWEBAPIADAPER_H_
#define SDRBASE_CHANNEL_CHANNELWEBAPIADAPER_H_
#include <QByteArray>
#include <QStringList>
#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_

3
sdrbase/plugin/plugininterface.h
View File

@ -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;
}

12
sdrbase/webapi/webapiadapterbase.cpp
View File

@ -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<QString, ChannelAPI*>::iterator it = m_webAPIChannelAdapters.find(registeredChannelURI);
QMap<QString, ChannelWebAPIAdapter*>::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;
}

6
sdrbase/webapi/webapiadapterbase.h
View File

@ -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<QString, ChannelAPI*> m_webAPIChannelAdapters;
QMap<QString, ChannelWebAPIAdapter*> m_webAPIChannelAdapters;
};
class WebAPIDeviceAdapters