summaryrefslogtreecommitdiffstats
path: root/plugins/channel
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/channel')
-rw-r--r--plugins/channel/nfm/nfmdemod.cpp6
-rw-r--r--plugins/channel/nfm/nfmdemod.h6
-rw-r--r--plugins/channel/tcpsrc/tcpsrc.cpp12
-rw-r--r--plugins/channel/tcpsrc/tcpsrc.h18
-rw-r--r--plugins/channel/tcpsrc/tcpsrcgui.cpp6
5 files changed, 24 insertions, 24 deletions
diff --git a/plugins/channel/nfm/nfmdemod.cpp b/plugins/channel/nfm/nfmdemod.cpp
index 843a6aa..359bf09 100644
--- a/plugins/channel/nfm/nfmdemod.cpp
+++ b/plugins/channel/nfm/nfmdemod.cpp
@@ -21,7 +21,7 @@
#include "audio/audiooutput.h"
#include "dsp/dspcommands.h"
-MessageRegistrator NFMDemod::MsgConfigureNFMDemod::ID("MsgConfigureNFMDemod");
+MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message)
NFMDemod::NFMDemod(AudioFifo* audioFifo, SampleSink* sampleSink) :
m_sampleSink(sampleSink),
@@ -119,7 +119,7 @@ void NFMDemod::stop()
bool NFMDemod::handleMessage(Message* cmd)
{
- if(cmd->id() == DSPSignalNotification::ID()) {
+ if(DSPSignalNotification::match(cmd)) {
DSPSignalNotification* signal = (DSPSignalNotification*)cmd;
qDebug("%d samples/sec, %lld Hz offset", signal->getSampleRate(), signal->getFrequencyOffset());
m_sampleRate = signal->getSampleRate();
@@ -129,7 +129,7 @@ bool NFMDemod::handleMessage(Message* cmd)
m_squelchState = 0;
cmd->completed();
return true;
- } else if(cmd->id() == MsgConfigureNFMDemod::ID()) {
+ } else if(MsgConfigureNFMDemod::match(cmd)) {
MsgConfigureNFMDemod* cfg = (MsgConfigureNFMDemod*)cmd;
m_rfBandwidth = cfg->getRFBandwidth();
m_interpolator.create(16, m_sampleRate, m_rfBandwidth / 2.1);
diff --git a/plugins/channel/nfm/nfmdemod.h b/plugins/channel/nfm/nfmdemod.h
index 4826f33..a312abb 100644
--- a/plugins/channel/nfm/nfmdemod.h
+++ b/plugins/channel/nfm/nfmdemod.h
@@ -43,9 +43,9 @@ public:
private:
class MsgConfigureNFMDemod : public Message {
- public:
- static MessageRegistrator ID;
+ MESSAGE_CLASS_DECLARATION
+ public:
Real getRFBandwidth() const { return m_rfBandwidth; }
Real getAFBandwidth() const { return m_afBandwidth; }
Real getVolume() const { return m_volume; }
@@ -63,7 +63,7 @@ private:
Real m_squelch;
MsgConfigureNFMDemod(Real rfBandwidth, Real afBandwidth, Real volume, Real squelch) :
- Message(ID()),
+ Message(),
m_rfBandwidth(rfBandwidth),
m_afBandwidth(afBandwidth),
m_volume(volume),
diff --git a/plugins/channel/tcpsrc/tcpsrc.cpp b/plugins/channel/tcpsrc/tcpsrc.cpp
index 02a55d2..9cfee43 100644
--- a/plugins/channel/tcpsrc/tcpsrc.cpp
+++ b/plugins/channel/tcpsrc/tcpsrc.cpp
@@ -5,9 +5,9 @@
#include "tcpsrcgui.h"
#include "dsp/dspcommands.h"
-MessageRegistrator TCPSrc::MsgTCPSrcConfigure::ID("MsgTCPSrcConfigure");
-MessageRegistrator TCPSrc::MsgTCPSrcConnection::ID("MsgTCPSrcConnection");
-MessageRegistrator TCPSrc::MsgTCPSrcSpectrum::ID("MsgTCPSrcSpectrum");
+MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConfigure, Message)
+MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConnection, Message)
+MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcSpectrum, Message)
TCPSrc::TCPSrc(MessageQueue* uiMessageQueue, TCPSrcGUI* tcpSrcGUI, SampleSink* spectrum)
{
@@ -97,7 +97,7 @@ void TCPSrc::stop()
bool TCPSrc::handleMessage(Message* cmd)
{
- if(cmd->id() == DSPSignalNotification::ID()) {
+ if(DSPSignalNotification::match(cmd)) {
DSPSignalNotification* signal = (DSPSignalNotification*)cmd;
qDebug("%d samples/sec, %lld Hz offset", signal->getSampleRate(), signal->getFrequencyOffset());
m_inputSampleRate = signal->getSampleRate();
@@ -106,7 +106,7 @@ bool TCPSrc::handleMessage(Message* cmd)
m_sampleDistanceRemain = m_inputSampleRate / m_outputSampleRate;
cmd->completed();
return true;
- } else if(cmd->id() == MsgTCPSrcConfigure::ID()) {
+ } else if(DSPSignalNotification::match(cmd)) {
MsgTCPSrcConfigure* cfg = (MsgTCPSrcConfigure*)cmd;
m_sampleFormat = cfg->getSampleFormat();
m_outputSampleRate = cfg->getOutputSampleRate();
@@ -121,7 +121,7 @@ bool TCPSrc::handleMessage(Message* cmd)
m_sampleDistanceRemain = m_inputSampleRate / m_outputSampleRate;
cmd->completed();
return true;
- } else if(cmd->id() == MsgTCPSrcSpectrum::ID()) {
+ } else if(MsgTCPSrcSpectrum::match(cmd)) {
MsgTCPSrcSpectrum* spc = (MsgTCPSrcSpectrum*)cmd;
m_spectrumEnabled = spc->getEnabled();
cmd->completed();
diff --git a/plugins/channel/tcpsrc/tcpsrc.h b/plugins/channel/tcpsrc/tcpsrc.h
index a8270ff..012a4df 100644
--- a/plugins/channel/tcpsrc/tcpsrc.h
+++ b/plugins/channel/tcpsrc/tcpsrc.h
@@ -32,9 +32,9 @@ public:
bool handleMessage(Message* cmd);
class MsgTCPSrcConnection : public Message {
- public:
- static MessageRegistrator ID;
+ MESSAGE_CLASS_DECLARATION
+ public:
bool getConnect() const { return m_connect; }
quint32 getID() const { return m_id; }
const QHostAddress& getPeerAddress() const { return m_peerAddress; }
@@ -52,7 +52,7 @@ public:
int m_peerPort;
MsgTCPSrcConnection(bool connect, quint32 id, const QHostAddress& peerAddress, int peerPort) :
- Message(ID()),
+ Message(),
m_connect(connect),
m_id(id),
m_peerAddress(peerAddress),
@@ -62,9 +62,9 @@ public:
protected:
class MsgTCPSrcConfigure : public Message {
- public:
- static MessageRegistrator ID;
+ MESSAGE_CLASS_DECLARATION
+ public:
SampleFormat getSampleFormat() const { return m_sampleFormat; }
Real getOutputSampleRate() const { return m_outputSampleRate; }
Real getRFBandwidth() const { return m_rfBandwidth; }
@@ -82,7 +82,7 @@ protected:
int m_tcpPort;
MsgTCPSrcConfigure(SampleFormat sampleFormat, Real outputSampleRate, Real rfBandwidth, int tcpPort) :
- Message(ID()),
+ Message(),
m_sampleFormat(sampleFormat),
m_outputSampleRate(outputSampleRate),
m_rfBandwidth(rfBandwidth),
@@ -90,9 +90,9 @@ protected:
{ }
};
class MsgTCPSrcSpectrum : public Message {
- public:
- static MessageRegistrator ID;
+ MESSAGE_CLASS_DECLARATION
+ public:
bool getEnabled() const { return m_enabled; }
static MsgTCPSrcSpectrum* create(bool enabled)
@@ -104,7 +104,7 @@ protected:
bool m_enabled;
MsgTCPSrcSpectrum(bool enabled) :
- Message(ID()),
+ Message(),
m_enabled(enabled)
{ }
};
diff --git a/plugins/channel/tcpsrc/tcpsrcgui.cpp b/plugins/channel/tcpsrc/tcpsrcgui.cpp
index 5e8f13d..a7dcab2 100644
--- a/plugins/channel/tcpsrc/tcpsrcgui.cpp
+++ b/plugins/channel/tcpsrc/tcpsrcgui.cpp
@@ -98,11 +98,11 @@ bool TCPSrcGUI::deserialize(const QByteArray& data)
bool TCPSrcGUI::handleMessage(Message* message)
{
- if(message->id() == TCPSrc::MsgTCPSrcConnection::ID()) {
+ if(TCPSrc::MsgTCPSrcConnection::match(message)) {
TCPSrc::MsgTCPSrcConnection* con = (TCPSrc::MsgTCPSrcConnection*)message;
if(con->getConnect())
- addConnection(con->id(), con->getPeerAddress(), con->getPeerPort());
- else delConnection(con->id());
+ addConnection(con->getID(), con->getPeerAddress(), con->getPeerPort());
+ else delConnection(con->getID());
message->completed();
return true;
} else {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 16:32:44 +0000