From 7689a161093a180a985c07f92775449d776aa30f Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 26 Mar 2022 09:51:06 +0100 Subject: [PATCH] ChannelAPI: Added more convenient getIdentifier pure virtual method --- plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h | 1 + plugins/channelmimo/interferometer/interferometer.h | 1 + plugins/channelrx/chanalyzer/chanalyzer.h | 1 + plugins/channelrx/demodadsb/adsbdemod.h | 1 + plugins/channelrx/demodais/aisdemod.h | 1 + plugins/channelrx/demodam/amdemod.h | 1 + plugins/channelrx/demodapt/aptdemod.h | 1 + plugins/channelrx/demodatv/atvdemod.h | 1 + plugins/channelrx/demodbfm/bfmdemod.h | 1 + plugins/channelrx/demodchirpchat/chirpchatdemod.h | 1 + plugins/channelrx/demoddab/dabdemod.h | 1 + plugins/channelrx/demoddatv/datvdemod.h | 1 + plugins/channelrx/demoddsd/dsddemod.h | 1 + plugins/channelrx/demodfreedv/freedvdemod.h | 1 + plugins/channelrx/demodnfm/nfmdemod.h | 1 + plugins/channelrx/demodpacket/packetdemod.h | 1 + plugins/channelrx/demodpager/pagerdemod.h | 1 + plugins/channelrx/demodradiosonde/radiosondedemod.h | 1 + plugins/channelrx/demodssb/ssbdemod.h | 1 + plugins/channelrx/demodvor/vordemod.h | 1 + plugins/channelrx/demodvorsc/vordemodsc.h | 1 + plugins/channelrx/demodwfm/wfmdemod.h | 1 + plugins/channelrx/filesink/filesink.h | 1 + plugins/channelrx/freqtracker/freqtracker.h | 1 + plugins/channelrx/localsink/localsink.h | 1 + plugins/channelrx/noisefigure/noisefigure.h | 1 + plugins/channelrx/radioastronomy/radioastronomy.h | 1 + plugins/channelrx/radioclock/radioclock.h | 1 + plugins/channelrx/remotesink/remotesink.h | 1 + plugins/channelrx/sigmffilesink/sigmffilesink.h | 1 + plugins/channelrx/udpsink/udpsink.h | 1 + plugins/channeltx/filesource/filesource.h | 1 + plugins/channeltx/localsource/localsource.h | 1 + plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h | 1 + plugins/channeltx/modais/aismod.h | 1 + plugins/channeltx/modam/ammod.h | 1 + plugins/channeltx/modatv/atvmod.h | 1 + plugins/channeltx/modchirpchat/chirpchatmod.h | 1 + plugins/channeltx/moddatv/datvmod.h | 1 + plugins/channeltx/modfreedv/freedvmod.h | 1 + plugins/channeltx/modnfm/nfmmod.h | 1 + plugins/channeltx/modpacket/packetmod.h | 1 + plugins/channeltx/modssb/ssbmod.h | 1 + plugins/channeltx/modwfm/wfmmod.h | 1 + plugins/channeltx/remotesource/remotesource.h | 1 + plugins/channeltx/udpsource/udpsource.h | 1 + plugins/feature/jogdialcontroller/jogdialcontroller.cpp | 8 ++------ sdrbase/channel/channelapi.h | 1 + 48 files changed, 49 insertions(+), 6 deletions(-) diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h index 486cdac83..04f56beeb 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h @@ -99,6 +99,7 @@ public: virtual QString getMIMOName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = "BeamSteeringCWMod"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channelmimo/interferometer/interferometer.h b/plugins/channelmimo/interferometer/interferometer.h index 6dd9f3663..9cb6b8118 100644 --- a/plugins/channelmimo/interferometer/interferometer.h +++ b/plugins/channelmimo/interferometer/interferometer.h @@ -99,6 +99,7 @@ public: virtual QString getMIMOName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = "Interferometer"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channelrx/chanalyzer/chanalyzer.h b/plugins/channelrx/chanalyzer/chanalyzer.h index 0dda3c8fe..5cc6b5542 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.h +++ b/plugins/channelrx/chanalyzer/chanalyzer.h @@ -84,6 +84,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = objectName(); } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodadsb/adsbdemod.h b/plugins/channelrx/demodadsb/adsbdemod.h index 82801585c..db4a80797 100644 --- a/plugins/channelrx/demodadsb/adsbdemod.h +++ b/plugins/channelrx/demodadsb/adsbdemod.h @@ -74,6 +74,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodais/aisdemod.h b/plugins/channelrx/demodais/aisdemod.h index 51eae9fde..713f05229 100644 --- a/plugins/channelrx/demodais/aisdemod.h +++ b/plugins/channelrx/demodais/aisdemod.h @@ -102,6 +102,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/demodam/amdemod.h b/plugins/channelrx/demodam/amdemod.h index 7e17aa6ed..145f36748 100644 --- a/plugins/channelrx/demodam/amdemod.h +++ b/plugins/channelrx/demodam/amdemod.h @@ -73,6 +73,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodapt/aptdemod.h b/plugins/channelrx/demodapt/aptdemod.h index 1f9a812fd..303ade6da 100644 --- a/plugins/channelrx/demodapt/aptdemod.h +++ b/plugins/channelrx/demodapt/aptdemod.h @@ -207,6 +207,7 @@ public: } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h index a700746f8..e8e246c0c 100644 --- a/plugins/channelrx/demodatv/atvdemod.h +++ b/plugins/channelrx/demodatv/atvdemod.h @@ -72,6 +72,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = objectName(); } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodbfm/bfmdemod.h b/plugins/channelrx/demodbfm/bfmdemod.h index dd658f93e..0d6b654af 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.h +++ b/plugins/channelrx/demodbfm/bfmdemod.h @@ -81,6 +81,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemod.h b/plugins/channelrx/demodchirpchat/chirpchatdemod.h index 766223213..618782e9d 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemod.h +++ b/plugins/channelrx/demodchirpchat/chirpchatdemod.h @@ -212,6 +212,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demoddab/dabdemod.h b/plugins/channelrx/demoddab/dabdemod.h index 078a7cecb..a2423a7b9 100644 --- a/plugins/channelrx/demoddab/dabdemod.h +++ b/plugins/channelrx/demoddab/dabdemod.h @@ -322,6 +322,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/demoddatv/datvdemod.h b/plugins/channelrx/demoddatv/datvdemod.h index acf136b38..78befcd87 100644 --- a/plugins/channelrx/demoddatv/datvdemod.h +++ b/plugins/channelrx/demoddatv/datvdemod.h @@ -46,6 +46,7 @@ public: virtual void destroy() { delete this; } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = objectName(); } virtual qint64 getCenterFrequency() const { return m_settings.m_centerFrequency; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h index 0d656f64e..e402cad24 100644 --- a/plugins/channelrx/demoddsd/dsddemod.h +++ b/plugins/channelrx/demoddsd/dsddemod.h @@ -74,6 +74,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodfreedv/freedvdemod.h b/plugins/channelrx/demodfreedv/freedvdemod.h index bfc7c6ee0..8404998d8 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.h +++ b/plugins/channelrx/demodfreedv/freedvdemod.h @@ -87,6 +87,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h index 1761702f6..6581b053f 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.h +++ b/plugins/channelrx/demodnfm/nfmdemod.h @@ -73,6 +73,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodpacket/packetdemod.h b/plugins/channelrx/demodpacket/packetdemod.h index b2ca037ba..861ece372 100644 --- a/plugins/channelrx/demodpacket/packetdemod.h +++ b/plugins/channelrx/demodpacket/packetdemod.h @@ -76,6 +76,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/demodpager/pagerdemod.h b/plugins/channelrx/demodpager/pagerdemod.h index 378f34c0f..3561bf0a4 100644 --- a/plugins/channelrx/demodpager/pagerdemod.h +++ b/plugins/channelrx/demodpager/pagerdemod.h @@ -131,6 +131,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/demodradiosonde/radiosondedemod.h b/plugins/channelrx/demodradiosonde/radiosondedemod.h index c3f164402..5703eac62 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemod.h +++ b/plugins/channelrx/demodradiosonde/radiosondedemod.h @@ -111,6 +111,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h index 440f17a25..3345cbb05 100644 --- a/plugins/channelrx/demodssb/ssbdemod.h +++ b/plugins/channelrx/demodssb/ssbdemod.h @@ -76,6 +76,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/demodvor/vordemod.h b/plugins/channelrx/demodvor/vordemod.h index 34eb42e47..8ffd638da 100644 --- a/plugins/channelrx/demodvor/vordemod.h +++ b/plugins/channelrx/demodvor/vordemod.h @@ -74,6 +74,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return 0; } diff --git a/plugins/channelrx/demodvorsc/vordemodsc.h b/plugins/channelrx/demodvorsc/vordemodsc.h index cf5919ba0..5bca0a6df 100644 --- a/plugins/channelrx/demodvorsc/vordemodsc.h +++ b/plugins/channelrx/demodvorsc/vordemodsc.h @@ -74,6 +74,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/demodwfm/wfmdemod.h b/plugins/channelrx/demodwfm/wfmdemod.h index a14f56efa..beef2586b 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.h +++ b/plugins/channelrx/demodwfm/wfmdemod.h @@ -72,6 +72,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/filesink/filesink.h b/plugins/channelrx/filesink/filesink.h index 1d488a30b..679d2a04a 100644 --- a/plugins/channelrx/filesink/filesink.h +++ b/plugins/channelrx/filesink/filesink.h @@ -93,6 +93,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = "File Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channelrx/freqtracker/freqtracker.h b/plugins/channelrx/freqtracker/freqtracker.h index f74b236a2..e77c60dd5 100644 --- a/plugins/channelrx/freqtracker/freqtracker.h +++ b/plugins/channelrx/freqtracker/freqtracker.h @@ -72,6 +72,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channelrx/localsink/localsink.h b/plugins/channelrx/localsink/localsink.h index 0bec67920..41cc56a77 100644 --- a/plugins/channelrx/localsink/localsink.h +++ b/plugins/channelrx/localsink/localsink.h @@ -93,6 +93,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = "Local Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channelrx/noisefigure/noisefigure.h b/plugins/channelrx/noisefigure/noisefigure.h index b65710562..65cbb3c41 100644 --- a/plugins/channelrx/noisefigure/noisefigure.h +++ b/plugins/channelrx/noisefigure/noisefigure.h @@ -181,6 +181,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/radioastronomy/radioastronomy.h b/plugins/channelrx/radioastronomy/radioastronomy.h index 1a2df4064..efe0225d3 100644 --- a/plugins/channelrx/radioastronomy/radioastronomy.h +++ b/plugins/channelrx/radioastronomy/radioastronomy.h @@ -319,6 +319,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/radioclock/radioclock.h b/plugins/channelrx/radioclock/radioclock.h index b35f53760..2a8714b78 100644 --- a/plugins/channelrx/radioclock/radioclock.h +++ b/plugins/channelrx/radioclock/radioclock.h @@ -121,6 +121,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual const QString& getURI() const { return getName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } diff --git a/plugins/channelrx/remotesink/remotesink.h b/plugins/channelrx/remotesink/remotesink.h index 738411d80..0764449da 100644 --- a/plugins/channelrx/remotesink/remotesink.h +++ b/plugins/channelrx/remotesink/remotesink.h @@ -74,6 +74,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = "Remote Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.h b/plugins/channelrx/sigmffilesink/sigmffilesink.h index 9236c738f..3d8b4e82c 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.h @@ -93,6 +93,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = "SigMF File Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channelrx/udpsink/udpsink.h b/plugins/channelrx/udpsink/udpsink.h index 9e9fabe5f..c70f6bd43 100644 --- a/plugins/channelrx/udpsink/udpsink.h +++ b/plugins/channelrx/udpsink/udpsink.h @@ -79,6 +79,7 @@ public: virtual QString getSinkName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/filesource/filesource.h b/plugins/channeltx/filesource/filesource.h index 60087a161..0695b3af4 100644 --- a/plugins/channeltx/filesource/filesource.h +++ b/plugins/channeltx/filesource/filesource.h @@ -175,6 +175,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return 0; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channeltx/localsource/localsource.h b/plugins/channeltx/localsource/localsource.h index 4cab3544f..76639d3ea 100644 --- a/plugins/channeltx/localsource/localsource.h +++ b/plugins/channeltx/localsource/localsource.h @@ -91,6 +91,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = "Local Sink"; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h index d873878e1..8068e7f67 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h @@ -99,6 +99,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modais/aismod.h b/plugins/channeltx/modais/aismod.h index 76b0b644a..1f610be16 100644 --- a/plugins/channeltx/modais/aismod.h +++ b/plugins/channeltx/modais/aismod.h @@ -160,6 +160,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modam/ammod.h b/plugins/channeltx/modam/ammod.h index 0d66a771c..46001df0b 100644 --- a/plugins/channeltx/modam/ammod.h +++ b/plugins/channeltx/modam/ammod.h @@ -182,6 +182,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index ab11e488d..4c2cc4daf 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -254,6 +254,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.h b/plugins/channeltx/modchirpchat/chirpchatmod.h index a1cc7eca6..09c0c0b22 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.h +++ b/plugins/channeltx/modchirpchat/chirpchatmod.h @@ -97,6 +97,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/moddatv/datvmod.h b/plugins/channeltx/moddatv/datvmod.h index 82a294412..0cd939f2e 100644 --- a/plugins/channeltx/moddatv/datvmod.h +++ b/plugins/channeltx/moddatv/datvmod.h @@ -210,6 +210,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modfreedv/freedvmod.h b/plugins/channeltx/modfreedv/freedvmod.h index 58b10611f..49f2cc6d8 100644 --- a/plugins/channeltx/modfreedv/freedvmod.h +++ b/plugins/channeltx/modfreedv/freedvmod.h @@ -186,6 +186,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modnfm/nfmmod.h b/plugins/channeltx/modnfm/nfmmod.h index 29eed39da..121b1a9a1 100644 --- a/plugins/channeltx/modnfm/nfmmod.h +++ b/plugins/channeltx/modnfm/nfmmod.h @@ -182,6 +182,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modpacket/packetmod.h b/plugins/channeltx/modpacket/packetmod.h index 3ad3a6d9f..7a9bd95d6 100644 --- a/plugins/channeltx/modpacket/packetmod.h +++ b/plugins/channeltx/modpacket/packetmod.h @@ -150,6 +150,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h index 2df917278..77afa532f 100644 --- a/plugins/channeltx/modssb/ssbmod.h +++ b/plugins/channeltx/modssb/ssbmod.h @@ -184,6 +184,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/modwfm/wfmmod.h b/plugins/channeltx/modwfm/wfmmod.h index 6c3c1a171..0f05972bb 100644 --- a/plugins/channeltx/modwfm/wfmmod.h +++ b/plugins/channeltx/modwfm/wfmmod.h @@ -182,6 +182,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/channeltx/remotesource/remotesource.h b/plugins/channeltx/remotesource/remotesource.h index 0ba285133..b86a7ca21 100644 --- a/plugins/channeltx/remotesource/remotesource.h +++ b/plugins/channeltx/remotesource/remotesource.h @@ -186,6 +186,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_frequencyOffset; } virtual void setCenterFrequency(qint64) {} diff --git a/plugins/channeltx/udpsource/udpsource.h b/plugins/channeltx/udpsource/udpsource.h index c236f64a2..4d9cb6297 100644 --- a/plugins/channeltx/udpsource/udpsource.h +++ b/plugins/channeltx/udpsource/udpsource.h @@ -103,6 +103,7 @@ public: virtual QString getSourceName() { return objectName(); } virtual void getIdentifier(QString& id) { id = objectName(); } + virtual QString getIdentifier() const { return objectName(); } virtual void getTitle(QString& title) { title = m_settings.m_title; } virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; } virtual void setCenterFrequency(qint64 frequency); diff --git a/plugins/feature/jogdialcontroller/jogdialcontroller.cpp b/plugins/feature/jogdialcontroller/jogdialcontroller.cpp index bcee34f0e..3837d3524 100644 --- a/plugins/feature/jogdialcontroller/jogdialcontroller.cpp +++ b/plugins/feature/jogdialcontroller/jogdialcontroller.cpp @@ -132,11 +132,9 @@ bool JogdialController::handleMessage(const Message& cmd) { DeviceAPI *selectedDevice = m_availableChannels[cfg.getIndex()].m_deviceAPI; ChannelAPI *selectedChannel = m_availableChannels[cfg.getIndex()].m_channelAPI; - QString channelId; - selectedChannel->getIdentifier(channelId); qDebug() << "JogdialController::handleMessage: MsgSelectChannel" << "device:" << selectedDevice->getHardwareId() - << "channel:" << channelId; + << "channel:" << selectedChannel->getIdentifier(); m_selectedDevice = selectedDevice; m_selectedChannel = selectedChannel; m_selectedIndex = index; @@ -236,8 +234,6 @@ void JogdialController::updateChannels() for (int chi = 0; chi < (*it)->getNumberOfChannels(); chi++) { ChannelAPI *channel = (*it)->getChannelAt(chi); - QString channelId; - channel->getIdentifier(channelId); JogdialControllerSettings::AvailableChannel availableChannel = JogdialControllerSettings::AvailableChannel{ deviceSinkEngine != nullptr, @@ -246,7 +242,7 @@ void JogdialController::updateChannels() device, channel, device->getHardwareId(), - channelId + channel->getIdentifier() }; m_availableChannels.push_back(availableChannel); } diff --git a/sdrbase/channel/channelapi.h b/sdrbase/channel/channelapi.h index 8a2b0e8e5..65405560e 100644 --- a/sdrbase/channel/channelapi.h +++ b/sdrbase/channel/channelapi.h @@ -55,6 +55,7 @@ public: virtual void destroy() = 0; virtual void getIdentifier(QString& id) = 0; + virtual QString getIdentifier() const = 0; const QString& getURI() const { return m_uri; } virtual void getTitle(QString& title) = 0; virtual void setName(const QString& name) { m_name = name; }