From a839695c3a3a9ceb9cd3b89f681d218d2274dd4b Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 30 May 2018 22:25:57 +0200 Subject: [PATCH] AM, NFM, SSB and WFM demods: changed channel Id URI --- plugins/channelrx/demodam/amdemod.cpp | 2 +- plugins/channelrx/demodam/amdemodplugin.h | 2 +- plugins/channelrx/demodnfm/nfmdemod.cpp | 2 +- plugins/channelrx/demodnfm/nfmplugin.h | 2 +- plugins/channelrx/demodssb/ssbdemod.cpp | 2 +- plugins/channelrx/demodssb/ssbplugin.h | 2 +- plugins/channelrx/demodwfm/wfmdemod.cpp | 2 +- plugins/channelrx/demodwfm/wfmplugin.h | 2 +- sdrgui/device/deviceuiset.cpp | 8 ++++++++ sdrsrv/device/deviceset.cpp | 8 ++++++++ 10 files changed, 24 insertions(+), 8 deletions(-) diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index e81436311..0232d6927 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -40,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message) MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureChannelizer, Message) -const QString AMDemod::m_channelIdURI = "de.maintech.sdrangelove.channel.am"; +const QString AMDemod::m_channelIdURI = "sdrangel.channel.amdemod"; const QString AMDemod::m_channelId = "AMDemod"; const int AMDemod::m_udpBlockSize = 512; diff --git a/plugins/channelrx/demodam/amdemodplugin.h b/plugins/channelrx/demodam/amdemodplugin.h index efcaf974b..5a20b596d 100644 --- a/plugins/channelrx/demodam/amdemodplugin.h +++ b/plugins/channelrx/demodam/amdemodplugin.h @@ -26,7 +26,7 @@ class BasebandSampleSink; class AMDemodPlugin : public QObject, PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.am") + Q_PLUGIN_METADATA(IID "sdrangel.channel.amdemod") public: explicit AMDemodPlugin(QObject* parent = NULL); diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 4ddc77593..29c1de46f 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -40,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message) MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureChannelizer, Message) MESSAGE_CLASS_DEFINITION(NFMDemod::MsgReportCTCSSFreq, Message) -const QString NFMDemod::m_channelIdURI = "de.maintech.sdrangelove.channel.nfm"; +const QString NFMDemod::m_channelIdURI = "sdrangel.channel.nfmdemod"; const QString NFMDemod::m_channelId = "NFMDemod"; static const double afSqTones[2] = {1000.0, 6000.0}; // {1200.0, 8000.0}; diff --git a/plugins/channelrx/demodnfm/nfmplugin.h b/plugins/channelrx/demodnfm/nfmplugin.h index b5f90af70..c5c07976a 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.h +++ b/plugins/channelrx/demodnfm/nfmplugin.h @@ -10,7 +10,7 @@ class BasebandSampleSink; class NFMPlugin : public QObject, PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.nfm") + Q_PLUGIN_METADATA(IID "sdrangel.channel.nfmdemod") public: explicit NFMPlugin(QObject* parent = NULL); diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index 2efeb6ea2..82749468c 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -40,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message) MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemodPrivate, Message) MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureChannelizer, Message) -const QString SSBDemod::m_channelIdURI = "de.maintech.sdrangelove.channel.ssb"; +const QString SSBDemod::m_channelIdURI = "sdrangel.channel.ssbdemod"; const QString SSBDemod::m_channelId = "SSBDemod"; SSBDemod::SSBDemod(DeviceSourceAPI *deviceAPI) : diff --git a/plugins/channelrx/demodssb/ssbplugin.h b/plugins/channelrx/demodssb/ssbplugin.h index b965d5c1c..f76f8e73d 100644 --- a/plugins/channelrx/demodssb/ssbplugin.h +++ b/plugins/channelrx/demodssb/ssbplugin.h @@ -10,7 +10,7 @@ class BasebandSampleSink; class SSBPlugin : public QObject, PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.ssb") + Q_PLUGIN_METADATA(IID "sdrangel.channel.ssbdemod") public: explicit SSBPlugin(QObject* parent = NULL); diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index 81378b46f..e4354a331 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -39,7 +39,7 @@ MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message) MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureChannelizer, Message) -const QString WFMDemod::m_channelIdURI = "de.maintech.sdrangelove.channel.wfm"; +const QString WFMDemod::m_channelIdURI = "sdrangel.channel.wfmdemod"; const QString WFMDemod::m_channelId = "WFMDemod"; const int WFMDemod::m_udpBlockSize = 512; diff --git a/plugins/channelrx/demodwfm/wfmplugin.h b/plugins/channelrx/demodwfm/wfmplugin.h index c2676ce11..5b5e3be2a 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.h +++ b/plugins/channelrx/demodwfm/wfmplugin.h @@ -10,7 +10,7 @@ class BasebandSampleSink; class WFMPlugin : public QObject, PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.wfm") + Q_PLUGIN_METADATA(IID "sdrangel.channel.wfmdemod") public: explicit WFMPlugin(QObject* parent = NULL); diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index 8ab6b5d48..deb1c5916 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -356,6 +356,14 @@ bool DeviceUISet::compareRxChannelURIs(const QString& registerdChannelURI, const { if ((xChannelURI == "sdrangel.channel.chanalyzerng") || (xChannelURI == "sdrangel.channel.chanalyzer")) { // renamed ChanalyzerNG to Chanalyzer in 4.0.0 return registerdChannelURI == "sdrangel.channel.chanalyzer"; + } else if ((xChannelURI == "de.maintech.sdrangelove.channel.am") || (xChannelURI == "sdrangel.channel.amdemod")) { + return registerdChannelURI == "sdrangel.channel.amdemod"; + } else if ((xChannelURI == "de.maintech.sdrangelove.channel.nfm") || (xChannelURI == "sdrangel.channel.nfmdemod")) { + return registerdChannelURI == "sdrangel.channel.nfmdemod"; + } else if ((xChannelURI == "de.maintech.sdrangelove.channel.ssb") || (xChannelURI == "sdrangel.channel.ssbdemod")) { + return registerdChannelURI == "sdrangel.channel.ssbdemod"; + } else if ((xChannelURI == "de.maintech.sdrangelove.channel.wfm") || (xChannelURI == "sdrangel.channel.wfmdemod")) { + return registerdChannelURI == "sdrangel.channel.wfmdemod"; } else { return registerdChannelURI == xChannelURI; } diff --git a/sdrsrv/device/deviceset.cpp b/sdrsrv/device/deviceset.cpp index 07585b64f..b7b9f2cca 100644 --- a/sdrsrv/device/deviceset.cpp +++ b/sdrsrv/device/deviceset.cpp @@ -376,6 +376,14 @@ bool DeviceSet::compareRxChannelURIs(const QString& registerdChannelURI, const Q { if ((xChannelURI == "sdrangel.channel.chanalyzerng") || (xChannelURI == "sdrangel.channel.chanalyzer")) { // renamed ChanalyzerNG to Chanalyzer in 4.0.0 return registerdChannelURI == "sdrangel.channel.chanalyzer"; + } else if ((xChannelURI == "de.maintech.sdrangelove.channel.am") || (xChannelURI == "sdrangel.channel.amdemod")) { + return registerdChannelURI == "sdrangel.channel.amdemod"; + } else if ((xChannelURI == "de.maintech.sdrangelove.channel.nfm") || (xChannelURI == "sdrangel.channel.nfmdemod")) { + return registerdChannelURI == "sdrangel.channel.nfmdemod"; + } else if ((xChannelURI == "de.maintech.sdrangelove.channel.ssb") || (xChannelURI == "sdrangel.channel.ssbdemod")) { + return registerdChannelURI == "sdrangel.channel.ssbdemod"; + } else if ((xChannelURI == "de.maintech.sdrangelove.channel.wfm") || (xChannelURI == "sdrangel.channel.wfmdemod")) { + return registerdChannelURI == "sdrangel.channel.wfmdemod"; } else { return registerdChannelURI == xChannelURI; }