VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 13:47:50 -04:00
Code Issues Projects Releases Wiki Activity

Avoid global QString init in plugins

Browse Source 
This workarounds issue with LTO with GCC #716
This commit is contained in:
Kacper Michajłow 2020-11-21 20:24:18 +01:00
parent cf70d9430f
commit f2d01b61d3
154 changed files with 302 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp
View File

@ -35,8 +35,8 @@
MESSAGE_CLASS_DEFINITION(BeamSteeringCWMod::MsgConfigureBeamSteeringCWMod, Message) MESSAGE_CLASS_DEFINITION(BeamSteeringCWMod::MsgConfigureBeamSteeringCWMod, Message)
MESSAGE_CLASS_DEFINITION(BeamSteeringCWMod::MsgBasebandNotification, Message) MESSAGE_CLASS_DEFINITION(BeamSteeringCWMod::MsgBasebandNotification, Message)
const QString BeamSteeringCWMod::m_channelIdURI = "sdrangel.channel.beamsteeringcwmod"; const char* const BeamSteeringCWMod::m_channelIdURI = "sdrangel.channel.beamsteeringcwmod";
const QString BeamSteeringCWMod::m_channelId = "BeamSteeringCWMod"; const char* const BeamSteeringCWMod::m_channelId = "BeamSteeringCWMod";
BeamSteeringCWMod::BeamSteeringCWMod(DeviceAPI *deviceAPI) : BeamSteeringCWMod::BeamSteeringCWMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamMIMO), ChannelAPI(m_channelIdURI, ChannelAPI::StreamMIMO),

8
plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h
View File

@ -97,8 +97,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples, unsigned int sourceIndex); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples, unsigned int sourceIndex);
virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "BeamSteeringCWMod"; } virtual void getTitle(QString& title) { title = "BeamSteeringCWMod"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
uint32_t getBasebandSampleRate() const { return m_basebandSampleRate; } uint32_t getBasebandSampleRate() const { return m_basebandSampleRate; }
@ -139,8 +139,8 @@ public:
const QStringList& channelSettingsKeys, const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response); SWGSDRangel::SWGChannelSettings& response);
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
static const int m_fftSize; static const int m_fftSize;
private: private:

4
plugins/channelmimo/interferometer/interferometer.cpp
View File

@ -35,8 +35,8 @@
MESSAGE_CLASS_DEFINITION(Interferometer::MsgConfigureInterferometer, Message) MESSAGE_CLASS_DEFINITION(Interferometer::MsgConfigureInterferometer, Message)
MESSAGE_CLASS_DEFINITION(Interferometer::MsgBasebandNotification, Message) MESSAGE_CLASS_DEFINITION(Interferometer::MsgBasebandNotification, Message)
const QString Interferometer::m_channelIdURI = "sdrangel.channel.interferometer"; const char* const Interferometer::m_channelIdURI = "sdrangel.channel.interferometer";
const QString Interferometer::m_channelId = "Interferometer"; const char* const Interferometer::m_channelId = "Interferometer";
const int Interferometer::m_fftSize = 4096; const int Interferometer::m_fftSize = 4096;
Interferometer::Interferometer(DeviceAPI *deviceAPI) : Interferometer::Interferometer(DeviceAPI *deviceAPI) :

8
plugins/channelmimo/interferometer/interferometer.h
View File

@ -98,8 +98,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples, unsigned int sourceIndex); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples, unsigned int sourceIndex);
virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "Interferometer"; } virtual void getTitle(QString& title) { title = "Interferometer"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
uint32_t getDeviceSampleRate() const { return m_deviceSampleRate; } uint32_t getDeviceSampleRate() const { return m_deviceSampleRate; }
@ -144,8 +144,8 @@ public:
const QStringList& channelSettingsKeys, const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response); SWGSDRangel::SWGChannelSettings& response);
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
static const int m_fftSize; static const int m_fftSize;
private: private:

4
plugins/channelrx/chanalyzer/chanalyzer.cpp
View File

@ -27,8 +27,8 @@
MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgConfigureChannelAnalyzer, Message) MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgConfigureChannelAnalyzer, Message)
const QString ChannelAnalyzer::m_channelIdURI = "sdrangel.channel.chanalyzer"; const char* const ChannelAnalyzer::m_channelIdURI = "sdrangel.channel.chanalyzer";
const QString ChannelAnalyzer::m_channelId = "ChannelAnalyzer"; const char* const ChannelAnalyzer::m_channelId = "ChannelAnalyzer";
ChannelAnalyzer::ChannelAnalyzer(DeviceAPI *deviceAPI) : ChannelAnalyzer::ChannelAnalyzer(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/chanalyzer/chanalyzer.h
View File

@ -77,8 +77,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = objectName(); } virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -95,8 +95,8 @@ public:
return m_settings.m_inputFrequencyOffset; return m_settings.m_inputFrequencyOffset;
} }
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/demodadsb/adsbdemod.cpp
View File

@ -46,8 +46,8 @@
MESSAGE_CLASS_DEFINITION(ADSBDemod::MsgConfigureADSBDemod, Message) MESSAGE_CLASS_DEFINITION(ADSBDemod::MsgConfigureADSBDemod, Message)
const QString ADSBDemod::m_channelIdURI = "sdrangel.channel.adsbdemod"; const char* const ADSBDemod::m_channelIdURI = "sdrangel.channel.adsbdemod";
const QString ADSBDemod::m_channelId = "ADSBDemod"; const char* const ADSBDemod::m_channelId = "ADSBDemod";
ADSBDemod::ADSBDemod(DeviceAPI *devieAPI) : ADSBDemod::ADSBDemod(DeviceAPI *devieAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/demodadsb/adsbdemod.h
View File

@ -73,8 +73,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -130,8 +130,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channelrx/demodam/amdemod.cpp
View File

@ -41,8 +41,8 @@
MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message) MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message)
const QString AMDemod::m_channelIdURI = "sdrangel.channel.amdemod"; const char* const AMDemod::m_channelIdURI = "sdrangel.channel.amdemod";
const QString AMDemod::m_channelId = "AMDemod"; const char* const AMDemod::m_channelId = "AMDemod";
const int AMDemod::m_udpBlockSize = 512; const int AMDemod::m_udpBlockSize = 512;
AMDemod::AMDemod(DeviceAPI *deviceAPI) : AMDemod::AMDemod(DeviceAPI *deviceAPI) :

8
plugins/channelrx/demodam/amdemod.h
View File

@ -71,8 +71,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -124,8 +124,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/demodatv/atvdemod.cpp
View File

@ -29,8 +29,8 @@
MESSAGE_CLASS_DEFINITION(ATVDemod::MsgConfigureATVDemod, Message) MESSAGE_CLASS_DEFINITION(ATVDemod::MsgConfigureATVDemod, Message)
const QString ATVDemod::m_channelIdURI = "sdrangel.channel.demodatv"; const char* const ATVDemod::m_channelIdURI = "sdrangel.channel.demodatv";
const QString ATVDemod::m_channelId = "ATVDemod"; const char* const ATVDemod::m_channelId = "ATVDemod";
ATVDemod::ATVDemod(DeviceAPI *deviceAPI) : ATVDemod::ATVDemod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/demodatv/atvdemod.h
View File

@ -70,8 +70,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = objectName(); } virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -94,8 +94,8 @@ public:
bool getBFOLocked() { return m_basebandSink->getBFOLocked(); } bool getBFOLocked() { return m_basebandSink->getBFOLocked(); }
void setVideoTabIndex(int videoTabIndex) { m_basebandSink->setVideoTabIndex(videoTabIndex); } void setVideoTabIndex(int videoTabIndex) { m_basebandSink->setVideoTabIndex(videoTabIndex); }
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channelrx/demodbfm/bfmdemod.cpp
View File

@ -43,8 +43,8 @@
MESSAGE_CLASS_DEFINITION(BFMDemod::MsgConfigureBFMDemod, Message) MESSAGE_CLASS_DEFINITION(BFMDemod::MsgConfigureBFMDemod, Message)
const QString BFMDemod::m_channelIdURI = "sdrangel.channel.bfm"; const char* const BFMDemod::m_channelIdURI = "sdrangel.channel.bfm";
const QString BFMDemod::m_channelId = "BFMDemod"; const char* const BFMDemod::m_channelId = "BFMDemod";
const int BFMDemod::m_udpBlockSize = 512; const int BFMDemod::m_udpBlockSize = 512;
BFMDemod::BFMDemod(DeviceAPI *deviceAPI) : BFMDemod::BFMDemod(DeviceAPI *deviceAPI) :

8
plugins/channelrx/demodbfm/bfmdemod.h
View File

@ -79,8 +79,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -138,8 +138,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/demodchirpchat/chirpchatdemod.cpp
View File

@ -44,8 +44,8 @@ MESSAGE_CLASS_DEFINITION(ChirpChatDemod::MsgConfigureChirpChatDemod, Message)
MESSAGE_CLASS_DEFINITION(ChirpChatDemod::MsgReportDecodeBytes, Message) MESSAGE_CLASS_DEFINITION(ChirpChatDemod::MsgReportDecodeBytes, Message)
MESSAGE_CLASS_DEFINITION(ChirpChatDemod::MsgReportDecodeString, Message) MESSAGE_CLASS_DEFINITION(ChirpChatDemod::MsgReportDecodeString, Message)
const QString ChirpChatDemod::m_channelIdURI = "sdrangel.channel.chirpchatdemod"; const char* const ChirpChatDemod::m_channelIdURI = "sdrangel.channel.chirpchatdemod";
const QString ChirpChatDemod::m_channelId = "ChirpChatDemod"; const char* const ChirpChatDemod::m_channelId = "ChirpChatDemod";
ChirpChatDemod::ChirpChatDemod(DeviceAPI* deviceAPI) : ChirpChatDemod::ChirpChatDemod(DeviceAPI* deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/demodchirpchat/chirpchatdemod.h
View File

@ -209,8 +209,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return 0; } virtual qint64 getCenterFrequency() const { return 0; }
@ -256,8 +256,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/demoddatv/datvdemod.cpp
View File

@ -23,8 +23,8 @@
#include "datvdemod.h" #include "datvdemod.h"
const QString DATVDemod::m_channelIdURI = "sdrangel.channel.demoddatv"; const char* const DATVDemod::m_channelIdURI = "sdrangel.channel.demoddatv";
const QString DATVDemod::m_channelId = "DATVDemod"; const char* const DATVDemod::m_channelId = "DATVDemod";
MESSAGE_CLASS_DEFINITION(DATVDemod::MsgConfigureDATVDemod, Message) MESSAGE_CLASS_DEFINITION(DATVDemod::MsgConfigureDATVDemod, Message)

8
plugins/channelrx/demoddatv/datvdemod.h
View File

@ -41,8 +41,8 @@ public:
virtual ~DATVDemod(); virtual ~DATVDemod();
virtual void destroy() { delete this; } virtual void destroy() { delete this; }
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = objectName(); } virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_centerFrequency; } virtual qint64 getCenterFrequency() const { return m_settings.m_centerFrequency; }
@ -80,8 +80,8 @@ public:
int getModcodCodeRate() const { return m_basebandSink->getModcodCodeRate(); } int getModcodCodeRate() const { return m_basebandSink->getModcodCodeRate(); }
bool isCstlnSetByModcod() const { return m_basebandSink->isCstlnSetByModcod(); } bool isCstlnSetByModcod() const { return m_basebandSink->isCstlnSetByModcod(); }
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
class MsgConfigureDATVDemod : public Message { class MsgConfigureDATVDemod : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION

2
plugins/channelrx/demoddatv/datvdemodgui.cpp
View File

@ -36,7 +36,7 @@
#include "datvdemodreport.h" #include "datvdemodreport.h"
#include "datvdemodgui.h" #include "datvdemodgui.h"
const QString DATVDemodGUI::m_strChannelID = "sdrangel.channel.demoddatv"; const char* const DATVDemodGUI::m_strChannelID = "sdrangel.channel.demoddatv";
DATVDemodGUI* DATVDemodGUI::create(PluginAPI* objPluginAPI, DATVDemodGUI* DATVDemodGUI::create(PluginAPI* objPluginAPI,
DeviceUISet *deviceUISet, DeviceUISet *deviceUISet,

2
plugins/channelrx/demoddatv/datvdemodgui.h
View File

@ -52,7 +52,7 @@ public:
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
static const QString m_strChannelID; static const char* const m_strChannelID;
private slots: private slots:
void channelMarkerChangedByCursor(); void channelMarkerChangedByCursor();

4
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -45,8 +45,8 @@
MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureDSDDemod, Message) MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureDSDDemod, Message)
const QString DSDDemod::m_channelIdURI = "sdrangel.channel.dsddemod"; const char* const DSDDemod::m_channelIdURI = "sdrangel.channel.dsddemod";
const QString DSDDemod::m_channelId = "DSDDemod"; const char* const DSDDemod::m_channelId = "DSDDemod";
const int DSDDemod::m_udpBlockSize = 512; const int DSDDemod::m_udpBlockSize = 512;
DSDDemod::DSDDemod(DeviceAPI *deviceAPI) : DSDDemod::DSDDemod(DeviceAPI *deviceAPI) :

8
plugins/channelrx/demoddsd/dsddemod.h
View File

@ -72,8 +72,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -123,8 +123,8 @@ public:
const char *updateAndGetStatusText() { return m_basebandSink->updateAndGetStatusText(); } const char *updateAndGetStatusText() { return m_basebandSink->updateAndGetStatusText(); }
int getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); } int getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); }
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/demodfreedv/freedvdemod.cpp
View File

@ -39,8 +39,8 @@
MESSAGE_CLASS_DEFINITION(FreeDVDemod::MsgConfigureFreeDVDemod, Message) MESSAGE_CLASS_DEFINITION(FreeDVDemod::MsgConfigureFreeDVDemod, Message)
MESSAGE_CLASS_DEFINITION(FreeDVDemod::MsgResyncFreeDVDemod, Message) MESSAGE_CLASS_DEFINITION(FreeDVDemod::MsgResyncFreeDVDemod, Message)
const QString FreeDVDemod::m_channelIdURI = "sdrangel.channel.freedvdemod"; const char* const FreeDVDemod::m_channelIdURI = "sdrangel.channel.freedvdemod";
const QString FreeDVDemod::m_channelId = "FreeDVDemod"; const char* const FreeDVDemod::m_channelId = "FreeDVDemod";
FreeDVDemod::FreeDVDemod(DeviceAPI *deviceAPI) : FreeDVDemod::FreeDVDemod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/demodfreedv/freedvdemod.h
View File

@ -85,8 +85,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -143,8 +143,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
void setLevelMeter(QObject *levelMeter); void setLevelMeter(QObject *levelMeter);
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -43,8 +43,8 @@
MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message) MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message)
const QString NFMDemod::m_channelIdURI = "sdrangel.channel.nfmdemod"; const char* const NFMDemod::m_channelIdURI = "sdrangel.channel.nfmdemod";
const QString NFMDemod::m_channelId = "NFMDemod"; const char* const NFMDemod::m_channelId = "NFMDemod";
const int NFMDemod::m_udpBlockSize = 512; const int NFMDemod::m_udpBlockSize = 512;

8
plugins/channelrx/demodnfm/nfmdemod.h
View File

@ -71,8 +71,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -124,8 +124,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channelrx/demodssb/ssbdemod.cpp
View File

@ -44,8 +44,8 @@
MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message) MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message)
const QString SSBDemod::m_channelIdURI = "sdrangel.channel.ssbdemod"; const char* const SSBDemod::m_channelIdURI = "sdrangel.channel.ssbdemod";
const QString SSBDemod::m_channelId = "SSBDemod"; const char* const SSBDemod::m_channelId = "SSBDemod";
SSBDemod::SSBDemod(DeviceAPI *deviceAPI) : SSBDemod::SSBDemod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/demodssb/ssbdemod.h
View File

@ -74,8 +74,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -128,8 +128,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/demodwfm/wfmdemod.cpp
View File

@ -46,8 +46,8 @@
MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message) MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message)
const QString WFMDemod::m_channelIdURI = "sdrangel.channel.wfmdemod"; const char* const WFMDemod::m_channelIdURI = "sdrangel.channel.wfmdemod";
const QString WFMDemod::m_channelId = "WFMDemod"; const char* const WFMDemod::m_channelId = "WFMDemod";
const int WFMDemod::m_udpBlockSize = 512; const int WFMDemod::m_udpBlockSize = 512;
WFMDemod::WFMDemod(DeviceAPI* deviceAPI) : WFMDemod::WFMDemod(DeviceAPI* deviceAPI) :

8
plugins/channelrx/demodwfm/wfmdemod.h
View File

@ -70,8 +70,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -119,8 +119,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channelrx/filesink/filesink.cpp
View File

@ -44,8 +44,8 @@
MESSAGE_CLASS_DEFINITION(FileSink::MsgConfigureFileSink, Message) MESSAGE_CLASS_DEFINITION(FileSink::MsgConfigureFileSink, Message)
const QString FileSink::m_channelIdURI = "sdrangel.channel.filesink"; const char* const FileSink::m_channelIdURI = "sdrangel.channel.filesink";
const QString FileSink::m_channelId = "FileSink"; const char* const FileSink::m_channelId = "FileSink";
FileSink::FileSink(DeviceAPI *deviceAPI) : FileSink::FileSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/filesink/filesink.h
View File

@ -72,8 +72,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "File Sink"; } virtual void getTitle(QString& title) { title = "File Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
@ -126,8 +126,8 @@ public:
uint64_t getByteCount() const; uint64_t getByteCount() const;
unsigned int getNbTracks() const; unsigned int getNbTracks() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/freqtracker/freqtracker.cpp
View File

@ -47,8 +47,8 @@
MESSAGE_CLASS_DEFINITION(FreqTracker::MsgConfigureFreqTracker, Message) MESSAGE_CLASS_DEFINITION(FreqTracker::MsgConfigureFreqTracker, Message)
const QString FreqTracker::m_channelIdURI = "sdrangel.channel.freqtracker"; const char* const FreqTracker::m_channelIdURI = "sdrangel.channel.freqtracker";
const QString FreqTracker::m_channelId = "FreqTracker"; const char* const FreqTracker::m_channelId = "FreqTracker";
const int FreqTracker::m_udpBlockSize = 512; const int FreqTracker::m_udpBlockSize = 512;
FreqTracker::FreqTracker(DeviceAPI *deviceAPI) : FreqTracker::FreqTracker(DeviceAPI *deviceAPI) :

8
plugins/channelrx/freqtracker/freqtracker.h
View File

@ -70,8 +70,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -126,8 +126,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channelrx/localsink/localsink.cpp
View File

@ -42,8 +42,8 @@
MESSAGE_CLASS_DEFINITION(LocalSink::MsgConfigureLocalSink, Message) MESSAGE_CLASS_DEFINITION(LocalSink::MsgConfigureLocalSink, Message)
MESSAGE_CLASS_DEFINITION(LocalSink::MsgBasebandSampleRateNotification, Message) MESSAGE_CLASS_DEFINITION(LocalSink::MsgBasebandSampleRateNotification, Message)
const QString LocalSink::m_channelIdURI = "sdrangel.channel.localsink"; const char* const LocalSink::m_channelIdURI = "sdrangel.channel.localsink";
const QString LocalSink::m_channelId = "LocalSink"; const char* const LocalSink::m_channelId = "LocalSink";
LocalSink::LocalSink(DeviceAPI *deviceAPI) : LocalSink::LocalSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/localsink/localsink.h
View File

@ -92,8 +92,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "Local Sink"; } virtual void getTitle(QString& title) { title = "Local Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
@ -132,8 +132,8 @@ public:
void getLocalDevices(std::vector<uint32_t>& indexes); void getLocalDevices(std::vector<uint32_t>& indexes);
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/remotesink/remotesink.cpp
View File

@ -43,8 +43,8 @@
MESSAGE_CLASS_DEFINITION(RemoteSink::MsgConfigureRemoteSink, Message) MESSAGE_CLASS_DEFINITION(RemoteSink::MsgConfigureRemoteSink, Message)
const QString RemoteSink::m_channelIdURI = "sdrangel.channel.remotesink"; const char* const RemoteSink::m_channelIdURI = "sdrangel.channel.remotesink";
const QString RemoteSink::m_channelId = "RemoteSink"; const char* const RemoteSink::m_channelId = "RemoteSink";
RemoteSink::RemoteSink(DeviceAPI *deviceAPI) : RemoteSink::RemoteSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/remotesink/remotesink.h
View File

@ -71,8 +71,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "Remote Sink"; } virtual void getTitle(QString& title) { title = "Remote Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
@ -111,8 +111,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
int getBasebandSampleRate() const { return m_basebandSampleRate; } int getBasebandSampleRate() const { return m_basebandSampleRate; }
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
signals: signals:
void dataBlockAvailable(RemoteDataBlock *dataBlock); void dataBlockAvailable(RemoteDataBlock *dataBlock);

4
plugins/channelrx/sigmffilesink/sigmffilesink.cpp
View File

@ -44,8 +44,8 @@
MESSAGE_CLASS_DEFINITION(SigMFFileSink::MsgConfigureSigMFFileSink, Message) MESSAGE_CLASS_DEFINITION(SigMFFileSink::MsgConfigureSigMFFileSink, Message)
const QString SigMFFileSink::m_channelIdURI = "sdrangel.channel.sigmffilesink"; const char* const SigMFFileSink::m_channelIdURI = "sdrangel.channel.sigmffilesink";
const QString SigMFFileSink::m_channelId = "SigMFFileSink"; const char* const SigMFFileSink::m_channelId = "SigMFFileSink";
SigMFFileSink::SigMFFileSink(DeviceAPI *deviceAPI) : SigMFFileSink::SigMFFileSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/sigmffilesink/sigmffilesink.h
View File

@ -72,8 +72,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "SigMF File Sink"; } virtual void getTitle(QString& title) { title = "SigMF File Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
@ -126,8 +126,8 @@ public:
uint64_t getByteCount() const; uint64_t getByteCount() const;
unsigned int getNbTracks() const; unsigned int getNbTracks() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channelrx/udpsink/udpsink.cpp
View File

@ -40,8 +40,8 @@
MESSAGE_CLASS_DEFINITION(UDPSink::MsgConfigureUDPSink, Message) MESSAGE_CLASS_DEFINITION(UDPSink::MsgConfigureUDPSink, Message)
const QString UDPSink::m_channelIdURI = "sdrangel.channel.udpsink"; const char* const UDPSink::m_channelIdURI = "sdrangel.channel.udpsink";
const QString UDPSink::m_channelId = "UDPSink"; const char* const UDPSink::m_channelId = "UDPSink";
UDPSink::UDPSink(DeviceAPI *deviceAPI) : UDPSink::UDPSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),

8
plugins/channelrx/udpsink/udpsink.h
View File

@ -78,8 +78,8 @@ public:
virtual void stop(); virtual void stop();
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -121,8 +121,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
static const int udpBlockSize = 512; // UDP block size in number of bytes static const int udpBlockSize = 512; // UDP block size in number of bytes
private slots: private slots:

4
plugins/channeltx/filesource/filesource.cpp
View File

@ -46,8 +46,8 @@ MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceStreamTiming, Message
MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceSeek, Message) MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceSeek, Message)
MESSAGE_CLASS_DEFINITION(FileSource::MsgReportFileSourceAcquisition, Message) MESSAGE_CLASS_DEFINITION(FileSource::MsgReportFileSourceAcquisition, Message)
const QString FileSource::m_channelIdURI = "sdrangel.channeltx.filesource"; const char* const FileSource::m_channelIdURI = "sdrangel.channeltx.filesource";
const QString FileSource::m_channelId ="FileSource"; const char* const FileSource::m_channelId ="FileSource";
FileSource::FileSource(DeviceAPI *deviceAPI) : FileSource::FileSource(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/filesource/filesource.h
View File

@ -174,8 +174,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return 0; } virtual qint64 getCenterFrequency() const { return 0; }
@ -231,8 +231,8 @@ public:
void setMessageQueueToGUI(MessageQueue* queue) override; void setMessageQueueToGUI(MessageQueue* queue) override;
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channeltx/localsource/localsource.cpp
View File

@ -39,8 +39,8 @@
MESSAGE_CLASS_DEFINITION(LocalSource::MsgConfigureLocalSource, Message) MESSAGE_CLASS_DEFINITION(LocalSource::MsgConfigureLocalSource, Message)
MESSAGE_CLASS_DEFINITION(LocalSource::MsgBasebandSampleRateNotification, Message) MESSAGE_CLASS_DEFINITION(LocalSource::MsgBasebandSampleRateNotification, Message)
const QString LocalSource::m_channelIdURI = "sdrangel.channel.localsource"; const char* const LocalSource::m_channelIdURI = "sdrangel.channel.localsource";
const QString LocalSource::m_channelId = "LocalSource"; const char* const LocalSource::m_channelId = "LocalSource";
LocalSource::LocalSource(DeviceAPI *deviceAPI) : LocalSource::LocalSource(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/localsource/localsource.h
View File

@ -89,8 +89,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "Local Sink"; } virtual void getTitle(QString& title) { title = "Local Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
@ -129,8 +129,8 @@ public:
void getLocalDevices(std::vector<uint32_t>& indexes); void getLocalDevices(std::vector<uint32_t>& indexes);
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;

4
plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
View File

@ -49,8 +49,8 @@
MESSAGE_CLASS_DEFINITION(IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod, Message) MESSAGE_CLASS_DEFINITION(IEEE_802_15_4_Mod::MsgConfigureIEEE_802_15_4_Mod, Message)
MESSAGE_CLASS_DEFINITION(IEEE_802_15_4_Mod::MsgTXIEEE_802_15_4_Mod, Message) MESSAGE_CLASS_DEFINITION(IEEE_802_15_4_Mod::MsgTXIEEE_802_15_4_Mod, Message)
const QString IEEE_802_15_4_Mod::m_channelIdURI = "sdrangel.channeltx.mod802.15.4"; const char* const IEEE_802_15_4_Mod::m_channelIdURI = "sdrangel.channeltx.mod802.15.4";
const QString IEEE_802_15_4_Mod::m_channelId = "IEEE_802_15_4_Mod"; const char* const IEEE_802_15_4_Mod::m_channelId = "IEEE_802_15_4_Mod";
IEEE_802_15_4_Mod::IEEE_802_15_4_Mod(DeviceAPI *deviceAPI) : IEEE_802_15_4_Mod::IEEE_802_15_4_Mod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

6
plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h
View File

@ -97,7 +97,7 @@ public:
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -148,8 +148,8 @@ public:
void setLevelMeter(QObject *levelMeter); void setLevelMeter(QObject *levelMeter);
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:

4
plugins/channeltx/modam/ammod.cpp
View File

@ -49,8 +49,8 @@ MESSAGE_CLASS_DEFINITION(AMMod::MsgConfigureFileSourceStreamTiming, Message)
MESSAGE_CLASS_DEFINITION(AMMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(AMMod::MsgReportFileSourceStreamData, Message)
MESSAGE_CLASS_DEFINITION(AMMod::MsgReportFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(AMMod::MsgReportFileSourceStreamTiming, Message)
const QString AMMod::m_channelIdURI = "sdrangel.channeltx.modam"; const char* const AMMod::m_channelIdURI = "sdrangel.channeltx.modam";
const QString AMMod::m_channelId ="AMMod"; const char* const AMMod::m_channelId ="AMMod";
AMMod::AMMod(DeviceAPI *deviceAPI) : AMMod::AMMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/modam/ammod.h
View File

@ -181,8 +181,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -229,8 +229,8 @@ public:
int getAudioSampleRate() const; int getAudioSampleRate() const;
int getFeedbackAudioSampleRate() const; int getFeedbackAudioSampleRate() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
enum RateState { enum RateState {

4
plugins/channeltx/modatv/atvmod.cpp
View File

@ -51,8 +51,8 @@ MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureVideoFileSourceStreamTiming, Messag
MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureCameraIndex, Message) MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureCameraIndex, Message)
MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureCameraData, Message) MESSAGE_CLASS_DEFINITION(ATVMod::MsgConfigureCameraData, Message)
const QString ATVMod::m_channelIdURI = "sdrangel.channeltx.modatv"; const char* const ATVMod::m_channelIdURI = "sdrangel.channeltx.modatv";
const QString ATVMod::m_channelId = "ATVMod"; const char* const ATVMod::m_channelId = "ATVMod";
ATVMod::ATVMod(DeviceAPI *deviceAPI) : ATVMod::ATVMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/modatv/atvmod.h
View File

@ -253,8 +253,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -302,8 +302,8 @@ public:
void getCameraNumbers(std::vector<int>& numbers); void getCameraNumbers(std::vector<int>& numbers);
void setMessageQueueToGUI(MessageQueue* queue) override; void setMessageQueueToGUI(MessageQueue* queue) override;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channeltx/modchirpchat/chirpchatmod.cpp
View File

@ -44,8 +44,8 @@
MESSAGE_CLASS_DEFINITION(ChirpChatMod::MsgConfigureChirpChatMod, Message) MESSAGE_CLASS_DEFINITION(ChirpChatMod::MsgConfigureChirpChatMod, Message)
MESSAGE_CLASS_DEFINITION(ChirpChatMod::MsgReportPayloadTime, Message) MESSAGE_CLASS_DEFINITION(ChirpChatMod::MsgReportPayloadTime, Message)
const QString ChirpChatMod::m_channelIdURI = "sdrangel.channeltx.modchirpchat"; const char* const ChirpChatMod::m_channelIdURI = "sdrangel.channeltx.modchirpchat";
const QString ChirpChatMod::m_channelId = "ChirpChatMod"; const char* const ChirpChatMod::m_channelId = "ChirpChatMod";
ChirpChatMod::ChirpChatMod(DeviceAPI *deviceAPI) : ChirpChatMod::ChirpChatMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/modchirpchat/chirpchatmod.h
View File

@ -95,8 +95,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -142,8 +142,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
bool getModulatorActive() const; bool getModulatorActive() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channeltx/modfreedv/freedvmod.cpp
View File

@ -48,8 +48,8 @@ MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgConfigureFileSourceStreamTiming, Message)
MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgReportFileSourceStreamData, Message)
MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgReportFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(FreeDVMod::MsgReportFileSourceStreamTiming, Message)
const QString FreeDVMod::m_channelIdURI = "sdrangel.channeltx.freedvmod"; const char* const FreeDVMod::m_channelIdURI = "sdrangel.channeltx.freedvmod";
const QString FreeDVMod::m_channelId = "FreeDVMod"; const char* const FreeDVMod::m_channelId = "FreeDVMod";
FreeDVMod::FreeDVMod(DeviceAPI *deviceAPI) : FreeDVMod::FreeDVMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/modfreedv/freedvmod.h
View File

@ -185,8 +185,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -236,8 +236,8 @@ public:
void setLevelMeter(QObject *levelMeter); void setLevelMeter(QObject *levelMeter);
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
enum RateState { enum RateState {

4
plugins/channeltx/modnfm/nfmmod.cpp
View File

@ -50,8 +50,8 @@ MESSAGE_CLASS_DEFINITION(NFMMod::MsgConfigureFileSourceStreamTiming, Message)
MESSAGE_CLASS_DEFINITION(NFMMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(NFMMod::MsgReportFileSourceStreamData, Message)
MESSAGE_CLASS_DEFINITION(NFMMod::MsgReportFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(NFMMod::MsgReportFileSourceStreamTiming, Message)
const QString NFMMod::m_channelIdURI = "sdrangel.channeltx.modnfm"; const char* const NFMMod::m_channelIdURI = "sdrangel.channeltx.modnfm";
const QString NFMMod::m_channelId = "NFMMod"; const char* const NFMMod::m_channelId = "NFMMod";
NFMMod::NFMMod(DeviceAPI *deviceAPI) : NFMMod::NFMMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/modnfm/nfmmod.h
View File

@ -181,8 +181,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -229,8 +229,8 @@ public:
int getAudioSampleRate() const; int getAudioSampleRate() const;
int getFeedbackAudioSampleRate() const; int getFeedbackAudioSampleRate() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
enum RateState { enum RateState {

4
plugins/channeltx/modpacket/packetmod.cpp
View File

@ -49,8 +49,8 @@
MESSAGE_CLASS_DEFINITION(PacketMod::MsgConfigurePacketMod, Message) MESSAGE_CLASS_DEFINITION(PacketMod::MsgConfigurePacketMod, Message)
MESSAGE_CLASS_DEFINITION(PacketMod::MsgTXPacketMod, Message) MESSAGE_CLASS_DEFINITION(PacketMod::MsgTXPacketMod, Message)
const QString PacketMod::m_channelIdURI = "sdrangel.channeltx.modpacket"; const char* const PacketMod::m_channelIdURI = "sdrangel.channeltx.modpacket";
const QString PacketMod::m_channelId = "PacketMod"; const char* const PacketMod::m_channelId = "PacketMod";
PacketMod::PacketMod(DeviceAPI *deviceAPI) : PacketMod::PacketMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/modpacket/packetmod.h
View File

@ -102,8 +102,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -153,8 +153,8 @@ public:
void setLevelMeter(QObject *levelMeter); void setLevelMeter(QObject *levelMeter);
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
enum RateState { enum RateState {

4
plugins/channeltx/modssb/ssbmod.cpp
View File

@ -49,8 +49,8 @@ MESSAGE_CLASS_DEFINITION(SSBMod::MsgConfigureFileSourceStreamTiming, Message)
MESSAGE_CLASS_DEFINITION(SSBMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(SSBMod::MsgReportFileSourceStreamData, Message)
MESSAGE_CLASS_DEFINITION(SSBMod::MsgReportFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(SSBMod::MsgReportFileSourceStreamTiming, Message)
const QString SSBMod::m_channelIdURI = "sdrangel.channeltx.modssb"; const char* const SSBMod::m_channelIdURI = "sdrangel.channeltx.modssb";
const QString SSBMod::m_channelId = "SSBMod"; const char* const SSBMod::m_channelId = "SSBMod";
SSBMod::SSBMod(DeviceAPI *deviceAPI) : SSBMod::SSBMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/modssb/ssbmod.h
View File

@ -183,8 +183,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -232,8 +232,8 @@ public:
int getFeedbackAudioSampleRate() const; int getFeedbackAudioSampleRate() const;
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
enum RateState { enum RateState {

4
plugins/channeltx/modwfm/wfmmod.cpp
View File

@ -48,8 +48,8 @@ MESSAGE_CLASS_DEFINITION(WFMMod::MsgConfigureFileSourceStreamTiming, Message)
MESSAGE_CLASS_DEFINITION(WFMMod::MsgReportFileSourceStreamData, Message) MESSAGE_CLASS_DEFINITION(WFMMod::MsgReportFileSourceStreamData, Message)
MESSAGE_CLASS_DEFINITION(WFMMod::MsgReportFileSourceStreamTiming, Message) MESSAGE_CLASS_DEFINITION(WFMMod::MsgReportFileSourceStreamTiming, Message)
const QString WFMMod::m_channelIdURI = "sdrangel.channeltx.modwfm"; const char* const WFMMod::m_channelIdURI = "sdrangel.channeltx.modwfm";
const QString WFMMod::m_channelId = "WFMMod"; const char* const WFMMod::m_channelId = "WFMMod";
WFMMod::WFMMod(DeviceAPI *deviceAPI) : WFMMod::WFMMod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/modwfm/wfmmod.h
View File

@ -181,8 +181,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -229,8 +229,8 @@ public:
int getAudioSampleRate() const; int getAudioSampleRate() const;
int getFeedbackAudioSampleRate() const; int getFeedbackAudioSampleRate() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
signals: signals:
/** /**

4
plugins/channeltx/remotesource/remotesource.cpp
View File

@ -40,8 +40,8 @@ MESSAGE_CLASS_DEFINITION(RemoteSource::MsgConfigureRemoteSource, Message)
MESSAGE_CLASS_DEFINITION(RemoteSource::MsgQueryStreamData, Message) MESSAGE_CLASS_DEFINITION(RemoteSource::MsgQueryStreamData, Message)
MESSAGE_CLASS_DEFINITION(RemoteSource::MsgReportStreamData, Message) MESSAGE_CLASS_DEFINITION(RemoteSource::MsgReportStreamData, Message)
const QString RemoteSource::m_channelIdURI = "sdrangel.channeltx.remotesource"; const char* const RemoteSource::m_channelIdURI = "sdrangel.channeltx.remotesource";
const QString RemoteSource::m_channelId ="RemoteSource"; const char* const RemoteSource::m_channelId ="RemoteSource";
RemoteSource::RemoteSource(DeviceAPI *deviceAPI) : RemoteSource::RemoteSource(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/remotesource/remotesource.h
View File

@ -164,8 +164,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return 0; } virtual qint64 getCenterFrequency() const { return 0; }
@ -207,8 +207,8 @@ public:
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private: private:
DeviceAPI* m_deviceAPI; DeviceAPI* m_deviceAPI;

4
plugins/channeltx/udpsource/udpsource.cpp
View File

@ -37,8 +37,8 @@
MESSAGE_CLASS_DEFINITION(UDPSource::MsgConfigureUDPSource, Message) MESSAGE_CLASS_DEFINITION(UDPSource::MsgConfigureUDPSource, Message)
MESSAGE_CLASS_DEFINITION(UDPSource::MsgConfigureChannelizer, Message) MESSAGE_CLASS_DEFINITION(UDPSource::MsgConfigureChannelizer, Message)
const QString UDPSource::m_channelIdURI = "sdrangel.channeltx.udpsource"; const char* const UDPSource::m_channelIdURI = "sdrangel.channeltx.udpsource";
const QString UDPSource::m_channelId = "UDPSource"; const char* const UDPSource::m_channelId = "UDPSource";
UDPSource::UDPSource(DeviceAPI *deviceAPI) : UDPSource::UDPSource(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSource),

8
plugins/channeltx/udpsource/udpsource.h
View File

@ -102,8 +102,8 @@ public:
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples);
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = m_channelId; } virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return m_channelIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
@ -153,8 +153,8 @@ public:
void setLevelMeter(QObject *levelMeter); void setLevelMeter(QObject *levelMeter);
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;
static const QString m_channelIdURI; static const char* const m_channelIdURI;
static const QString m_channelId; static const char* const m_channelId;
private slots: private slots:
void networkManagerFinished(QNetworkReply *reply); void networkManagerFinished(QNetworkReply *reply);

4
plugins/feature/afc/afc.cpp
View File

@ -40,8 +40,8 @@ MESSAGE_CLASS_DEFINITION(AFC::MsgStartStop, Message)
MESSAGE_CLASS_DEFINITION(AFC::MsgDeviceTrack, Message) MESSAGE_CLASS_DEFINITION(AFC::MsgDeviceTrack, Message)
MESSAGE_CLASS_DEFINITION(AFC::MsgDevicesApply, Message) MESSAGE_CLASS_DEFINITION(AFC::MsgDevicesApply, Message)
const QString AFC::m_featureIdURI = "sdrangel.feature.afc"; const char* const AFC::m_featureIdURI = "sdrangel.feature.afc";
const QString AFC::m_featureId = "AFC"; const char* const AFC::m_featureId = "AFC";
AFC::AFC(WebAPIAdapterInterface *webAPIAdapterInterface) : AFC::AFC(WebAPIAdapterInterface *webAPIAdapterInterface) :
Feature(m_featureIdURI, webAPIAdapterInterface), Feature(m_featureIdURI, webAPIAdapterInterface),

8
plugins/feature/afc/afc.h
View File

@ -112,8 +112,8 @@ public:
virtual void destroy() { delete this; } virtual void destroy() { delete this; }
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual const QString& getURI() const { return m_featureIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getIdentifier(QString& id) const { id = m_featureId; } virtual void getIdentifier(QString& id) const { id = objectName(); }
virtual void getTitle(QString& title) const { title = m_settings.m_title; } virtual void getTitle(QString& title) const { title = m_settings.m_title; }
virtual QByteArray serialize() const; virtual QByteArray serialize() const;
@ -151,8 +151,8 @@ public:
const QStringList& featureSettingsKeys, const QStringList& featureSettingsKeys,
SWGSDRangel::SWGFeatureSettings& response); SWGSDRangel::SWGFeatureSettings& response);
static const QString m_featureIdURI; static const char* const m_featureIdURI;
static const QString m_featureId; static const char* const m_featureId;
private: private:
QThread m_thread; QThread m_thread;

4
plugins/feature/gs232controller/gs232controller.cpp
View File

@ -35,8 +35,8 @@
MESSAGE_CLASS_DEFINITION(GS232Controller::MsgConfigureGS232Controller, Message) MESSAGE_CLASS_DEFINITION(GS232Controller::MsgConfigureGS232Controller, Message)
MESSAGE_CLASS_DEFINITION(GS232Controller::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(GS232Controller::MsgStartStop, Message)
const QString GS232Controller::m_featureIdURI = "sdrangel.feature.gs232controller"; const char* const GS232Controller::m_featureIdURI = "sdrangel.feature.gs232controller";
const QString GS232Controller::m_featureId = "GS232Controller"; const char* const GS232Controller::m_featureId = "GS232Controller";
GS232Controller::GS232Controller(WebAPIAdapterInterface *webAPIAdapterInterface) : GS232Controller::GS232Controller(WebAPIAdapterInterface *webAPIAdapterInterface) :
Feature(m_featureIdURI, webAPIAdapterInterface), Feature(m_featureIdURI, webAPIAdapterInterface),

8
plugins/feature/gs232controller/gs232controller.h
View File

@ -86,8 +86,8 @@ public:
virtual void destroy() { delete this; } virtual void destroy() { delete this; }
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual const QString& getURI() const { return m_featureIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getIdentifier(QString& id) const { id = m_featureId; } virtual void getIdentifier(QString& id) const { id = objectName(); }
virtual void getTitle(QString& title) const { title = m_settings.m_title; } virtual void getTitle(QString& title) const { title = m_settings.m_title; }
virtual QByteArray serialize() const; virtual QByteArray serialize() const;
@ -116,8 +116,8 @@ public:
const QStringList& featureSettingsKeys, const QStringList& featureSettingsKeys,
SWGSDRangel::SWGFeatureSettings& response); SWGSDRangel::SWGFeatureSettings& response);
static const QString m_featureIdURI; static const char* const m_featureIdURI;
static const QString m_featureId; static const char* const m_featureId;
private: private:
QThread m_thread; QThread m_thread;

4
plugins/feature/rigctlserver/rigctlserver.cpp
View File

@ -35,8 +35,8 @@
MESSAGE_CLASS_DEFINITION(RigCtlServer::MsgConfigureRigCtlServer, Message) MESSAGE_CLASS_DEFINITION(RigCtlServer::MsgConfigureRigCtlServer, Message)
MESSAGE_CLASS_DEFINITION(RigCtlServer::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(RigCtlServer::MsgStartStop, Message)
const QString RigCtlServer::m_featureIdURI = "sdrangel.feature.rigctlserver"; const char* const RigCtlServer::m_featureIdURI = "sdrangel.feature.rigctlserver";
const QString RigCtlServer::m_featureId = "RigCtlServer"; const char* const RigCtlServer::m_featureId = "RigCtlServer";
RigCtlServer::RigCtlServer(WebAPIAdapterInterface *webAPIAdapterInterface) : RigCtlServer::RigCtlServer(WebAPIAdapterInterface *webAPIAdapterInterface) :
Feature(m_featureIdURI, webAPIAdapterInterface), Feature(m_featureIdURI, webAPIAdapterInterface),

8
plugins/feature/rigctlserver/rigctlserver.h
View File

@ -86,8 +86,8 @@ public:
virtual void destroy() { delete this; } virtual void destroy() { delete this; }
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual const QString& getURI() const { return m_featureIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getIdentifier(QString& id) const { id = m_featureId; } virtual void getIdentifier(QString& id) const { id = objectName(); }
virtual void getTitle(QString& title) const { title = m_settings.m_title; } virtual void getTitle(QString& title) const { title = m_settings.m_title; }
virtual QByteArray serialize() const; virtual QByteArray serialize() const;
@ -116,8 +116,8 @@ public:
const QStringList& featureSettingsKeys, const QStringList& featureSettingsKeys,
SWGSDRangel::SWGFeatureSettings& response); SWGSDRangel::SWGFeatureSettings& response);
static const QString m_featureIdURI; static const char* const m_featureIdURI;
static const QString m_featureId; static const char* const m_featureId;
private: private:
QThread m_thread; QThread m_thread;

4
plugins/feature/simpleptt/simpleptt.cpp
View File

@ -35,8 +35,8 @@ MESSAGE_CLASS_DEFINITION(SimplePTT::MsgConfigureSimplePTT, Message)
MESSAGE_CLASS_DEFINITION(SimplePTT::MsgPTT, Message) MESSAGE_CLASS_DEFINITION(SimplePTT::MsgPTT, Message)
MESSAGE_CLASS_DEFINITION(SimplePTT::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(SimplePTT::MsgStartStop, Message)
const QString SimplePTT::m_featureIdURI = "sdrangel.feature.simpleptt"; const char* const SimplePTT::m_featureIdURI = "sdrangel.feature.simpleptt";
const QString SimplePTT::m_featureId = "SimplePTT"; const char* const SimplePTT::m_featureId = "SimplePTT";
SimplePTT::SimplePTT(WebAPIAdapterInterface *webAPIAdapterInterface) : SimplePTT::SimplePTT(WebAPIAdapterInterface *webAPIAdapterInterface) :
Feature(m_featureIdURI, webAPIAdapterInterface), Feature(m_featureIdURI, webAPIAdapterInterface),

8
plugins/feature/simpleptt/simpleptt.h
View File

@ -104,8 +104,8 @@ public:
virtual void destroy() { delete this; } virtual void destroy() { delete this; }
virtual bool handleMessage(const Message& cmd); virtual bool handleMessage(const Message& cmd);
virtual const QString& getURI() const { return m_featureIdURI; } virtual const QString& getURI() const { return getName(); }
virtual void getIdentifier(QString& id) const { id = m_featureId; } virtual void getIdentifier(QString& id) const { id = objectName(); }
virtual void getTitle(QString& title) const { title = m_settings.m_title; } virtual void getTitle(QString& title) const { title = m_settings.m_title; }
virtual QByteArray serialize() const; virtual QByteArray serialize() const;
@ -143,8 +143,8 @@ public:
const QStringList& featureSettingsKeys, const QStringList& featureSettingsKeys,
SWGSDRangel::SWGFeatureSettings& response); SWGSDRangel::SWGFeatureSettings& response);
static const QString m_featureIdURI; static const char* const m_featureIdURI;
static const QString m_featureId; static const char* const m_featureId;
private: private:
QThread m_thread; QThread m_thread;

4
plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp
View File

@ -37,8 +37,8 @@ const PluginDescriptor BladeRF2MIMOPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString BladeRF2MIMOPlugin::m_hardwareID = "BladeRF2"; static constexpr const char* const m_hardwareID = "BladeRF2";
const QString BladeRF2MIMOPlugin::m_deviceTypeID = BLADERF2MIMO_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = BLADERF2MIMO_DEVICE_TYPE_ID;
BladeRF2MIMOPlugin::BladeRF2MIMOPlugin(QObject* parent) : BladeRF2MIMOPlugin::BladeRF2MIMOPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.h
View File

@ -46,9 +46,6 @@ public:
virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp
View File

@ -38,8 +38,8 @@ const PluginDescriptor LimeSDRMIMOPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString LimeSDRMIMOPlugin::m_hardwareID = "LimeSDR"; static constexpr const char* const m_hardwareID = "LimeSDR";
const QString LimeSDRMIMOPlugin::m_deviceTypeID = LIMESDRMIMO_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = LIMESDRMIMO_DEVICE_TYPE_ID;
LimeSDRMIMOPlugin::LimeSDRMIMOPlugin(QObject* parent) : LimeSDRMIMOPlugin::LimeSDRMIMOPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplemimo/limesdrmimo/limesdrmimoplugin.h
View File

@ -46,9 +46,6 @@ public:
virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplemimo/metismiso/metismisoplugin.cpp
View File

@ -39,8 +39,8 @@ const PluginDescriptor MetisMISOPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString MetisMISOPlugin::m_hardwareID = "MetisMISO"; static constexpr const char* const m_hardwareID = "MetisMISO";
const QString MetisMISOPlugin::m_deviceTypeID = METISMISO_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = METISMISO_DEVICE_TYPE_ID;
MetisMISOPlugin::MetisMISOPlugin(QObject* parent) : MetisMISOPlugin::MetisMISOPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplemimo/metismiso/metismisoplugin.h
View File

@ -46,9 +46,6 @@ public:
virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplemimo/testmi/testmiplugin.cpp
View File

@ -38,8 +38,8 @@ const PluginDescriptor TestMIPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString TestMIPlugin::m_hardwareID = "TestMI"; static constexpr const char* const m_hardwareID = "TestMI";
const QString TestMIPlugin::m_deviceTypeID = TESTMI_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = TESTMI_DEVICE_TYPE_ID;
TestMIPlugin::TestMIPlugin(QObject* parent) : TestMIPlugin::TestMIPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplemimo/testmi/testmiplugin.h
View File

@ -45,9 +45,6 @@ public:
virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplemimo/testmosync/testmosyncplugin.cpp
View File

@ -36,8 +36,8 @@ const PluginDescriptor TestMOSyncPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString TestMOSyncPlugin::m_hardwareID = "TestMOSync"; static constexpr const char* const m_hardwareID = "TestMOSync";
const QString TestMOSyncPlugin::m_deviceTypeID = TESTMOSYNC_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = TESTMOSYNC_DEVICE_TYPE_ID;
TestMOSyncPlugin::TestMOSyncPlugin(QObject* parent) : TestMOSyncPlugin::TestMOSyncPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplemimo/testmosync/testmosyncplugin.h
View File

@ -45,9 +45,6 @@ public:
virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp
View File

@ -38,8 +38,8 @@ const PluginDescriptor XTRXMIMOPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString XTRXMIMOPlugin::m_hardwareID = "XTRX"; static constexpr const char* const m_hardwareID = "XTRX";
const QString XTRXMIMOPlugin::m_deviceTypeID = XTRXMIMO_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = XTRXMIMO_DEVICE_TYPE_ID;
XTRXMIMOPlugin::XTRXMIMOPlugin(QObject* parent) : XTRXMIMOPlugin::XTRXMIMOPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplemimo/xtrxmimo/xtrxmimoplugin.h
View File

@ -46,9 +46,6 @@ public:
virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI); virtual DeviceSampleMIMO* createSampleMIMOPluginInstance(const QString& sourceId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp
View File

@ -39,8 +39,8 @@ const PluginDescriptor Bladerf1OutputPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString Bladerf1OutputPlugin::m_hardwareID = "BladeRF1"; static constexpr const char* const m_hardwareID = "BladeRF1";
const QString Bladerf1OutputPlugin::m_deviceTypeID = BLADERF1OUTPUT_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = BLADERF1OUTPUT_DEVICE_TYPE_ID;
Bladerf1OutputPlugin::Bladerf1OutputPlugin(QObject* parent) : Bladerf1OutputPlugin::Bladerf1OutputPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplesink/bladerf1output/bladerf1outputplugin.h
View File

@ -47,9 +47,6 @@ public:
virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp
View File

@ -39,8 +39,8 @@ const PluginDescriptor BladeRF2OutputPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString BladeRF2OutputPlugin::m_hardwareID = "BladeRF2"; static constexpr const char* const m_hardwareID = "BladeRF2";
const QString BladeRF2OutputPlugin::m_deviceTypeID = BLADERF2OUTPUT_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = BLADERF2OUTPUT_DEVICE_TYPE_ID;
BladeRF2OutputPlugin::BladeRF2OutputPlugin(QObject* parent) : BladeRF2OutputPlugin::BladeRF2OutputPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplesink/bladerf2output/bladerf2outputplugin.h
View File

@ -47,9 +47,6 @@ public:
virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplesink/fileoutput/fileoutputplugin.cpp
View File

@ -37,8 +37,8 @@ const PluginDescriptor FileOutputPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString FileOutputPlugin::m_hardwareID = "FileOutput"; static constexpr const char* const m_hardwareID = "FileOutput";
const QString FileOutputPlugin::m_deviceTypeID = FILEOUTPUT_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = FILEOUTPUT_DEVICE_TYPE_ID;
FileOutputPlugin::FileOutputPlugin(QObject* parent) : FileOutputPlugin::FileOutputPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplesink/fileoutput/fileoutputplugin.h
View File

@ -45,9 +45,6 @@ public:
DeviceUISet *deviceUISet); DeviceUISet *deviceUISet);
virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

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

@ -39,8 +39,8 @@ const PluginDescriptor HackRFOutputPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString HackRFOutputPlugin::m_hardwareID = "HackRF"; static constexpr const char* const m_hardwareID = "HackRF";
const QString HackRFOutputPlugin::m_deviceTypeID = HACKRFOUTPUT_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = HACKRFOUTPUT_DEVICE_TYPE_ID;
HackRFOutputPlugin::HackRFOutputPlugin(QObject* parent) : HackRFOutputPlugin::HackRFOutputPlugin(QObject* parent) :
QObject(parent) QObject(parent)

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

@ -45,9 +45,6 @@ public:
virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

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

@ -42,8 +42,8 @@ const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString LimeSDROutputPlugin::m_hardwareID = "LimeSDR"; static constexpr const char* const m_hardwareID = "LimeSDR";
const QString LimeSDROutputPlugin::m_deviceTypeID = LIMESDROUTPUT_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = LIMESDROUTPUT_DEVICE_TYPE_ID;
LimeSDROutputPlugin::LimeSDROutputPlugin(QObject* parent) : LimeSDROutputPlugin::LimeSDROutputPlugin(QObject* parent) :
QObject(parent) QObject(parent)

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

@ -45,9 +45,6 @@ public:
virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

4
plugins/samplesink/localoutput/localoutputplugin.cpp
View File

@ -38,8 +38,8 @@ const PluginDescriptor LocalOutputPlugin::m_pluginDescriptor = {
QStringLiteral("https://github.com/f4exb/sdrangel") QStringLiteral("https://github.com/f4exb/sdrangel")
}; };
const QString LocalOutputPlugin::m_hardwareID = "LocalOutput"; static constexpr const char* const m_hardwareID = "LocalOutput";
const QString LocalOutputPlugin::m_deviceTypeID = LOCALOUTPUT_DEVICE_TYPE_ID; static constexpr const char* const m_deviceTypeID = LOCALOUTPUT_DEVICE_TYPE_ID;
LocalOutputPlugin::LocalOutputPlugin(QObject* parent) : LocalOutputPlugin::LocalOutputPlugin(QObject* parent) :
QObject(parent) QObject(parent)

3
plugins/samplesink/localoutput/localoutputplugin.h
View File

@ -45,9 +45,6 @@ public:
virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI); virtual DeviceSampleSink* createSampleSinkPluginInstance(const QString& sinkId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const; virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: private:
static const PluginDescriptor m_pluginDescriptor; static const PluginDescriptor m_pluginDescriptor;
}; };

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