From fcfcdc1205929ac0cc345c5a2b3b549fd1ab7e56 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 3 Oct 2020 04:48:37 +0200 Subject: [PATCH] Channel API: new getURI method. Applied to v5 plugins --- plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h | 3 ++- plugins/channelmimo/interferometer/interferometer.h | 3 ++- plugins/channelrx/demodchirpchat/chirpchatdemod.h | 3 ++- plugins/channelrx/sigmffilesink/sigmffilesink.h | 3 ++- plugins/channeltx/modchirpchat/chirpchatmod.h | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h index 6635c7757..d6a95a3a4 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h @@ -97,7 +97,8 @@ public: 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 void getIdentifier(QString& id) { id = objectName(); } + virtual void getIdentifier(QString& id) { id = m_channelId; } + virtual const QString& getURI() const { return m_channelIdURI; } virtual void getTitle(QString& title) { title = "BeamSteeringCWMod"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } uint32_t getBasebandSampleRate() const { return m_basebandSampleRate; } diff --git a/plugins/channelmimo/interferometer/interferometer.h b/plugins/channelmimo/interferometer/interferometer.h index 7b1839f82..fce61f9fa 100644 --- a/plugins/channelmimo/interferometer/interferometer.h +++ b/plugins/channelmimo/interferometer/interferometer.h @@ -98,7 +98,8 @@ public: 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 void getIdentifier(QString& id) { id = objectName(); } + virtual void getIdentifier(QString& id) { id = m_channelId; } + virtual const QString& getURI() const { return m_channelIdURI; } virtual void getTitle(QString& title) { title = "Interferometer"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } uint32_t getDeviceSampleRate() const { return m_deviceSampleRate; } diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemod.h b/plugins/channelrx/demodchirpchat/chirpchatdemod.h index 6cb182774..026ed39b1 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemod.h +++ b/plugins/channelrx/demodchirpchat/chirpchatdemod.h @@ -208,7 +208,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = objectName(); } + virtual void getIdentifier(QString& id) { id = m_channelId; } + virtual const QString& getURI() const { return m_channelIdURI; } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return 0; } diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.h b/plugins/channelrx/sigmffilesink/sigmffilesink.h index f6ae8cc5b..7541938b6 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.h @@ -71,7 +71,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = objectName(); } + virtual void getIdentifier(QString& id) { id = m_channelId; } + virtual const QString& getURI() const { return m_channelIdURI; } virtual void getTitle(QString& title) { title = "SigMF File Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.h b/plugins/channeltx/modchirpchat/chirpchatmod.h index 207ae118a..144aeb567 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.h +++ b/plugins/channeltx/modchirpchat/chirpchatmod.h @@ -95,7 +95,8 @@ public: virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples); virtual bool handleMessage(const Message& cmd); - virtual void getIdentifier(QString& id) { id = objectName(); } + virtual void getIdentifier(QString& id) { id = m_channelId; } + virtual const QString& getURI() const { return m_channelIdURI; } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }