From 9c063410fbca6a6317a9fc7f6c05b9eef584f789 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 2 Mar 2022 23:57:35 +0100 Subject: [PATCH] Message pipes rework: more renaming --- .../beamsteeringcwmod/beamsteeringcwmod.cpp | 2 +- plugins/channelmimo/interferometer/interferometer.cpp | 2 +- plugins/channelrx/chanalyzer/chanalyzer.cpp | 2 +- plugins/channelrx/demodadsb/adsbdemod.cpp | 2 +- plugins/channelrx/demodadsb/adsbdemodgui.cpp | 4 ++-- plugins/channelrx/demodais/aisdemod.cpp | 4 ++-- plugins/channelrx/demodais/aisdemodgui.cpp | 2 +- plugins/channelrx/demodam/amdemod.cpp | 4 ++-- plugins/channelrx/demodam/amdemodsink.cpp | 2 +- plugins/channelrx/demodapt/aptdemodgui.cpp | 2 +- plugins/channelrx/demodapt/aptdemodimageworker.cpp | 2 +- plugins/channelrx/demodbfm/bfmdemod.cpp | 2 +- plugins/channelrx/demodchirpchat/chirpchatdemod.cpp | 4 ++-- plugins/channelrx/demoddab/dabdemod.cpp | 2 +- plugins/channelrx/demoddab/dabdemodsink.cpp | 2 +- plugins/channelrx/demoddatv/datvdemod.cpp | 2 +- plugins/channelrx/demoddsd/dsddemod.cpp | 4 ++-- plugins/channelrx/demoddsd/dsddemodsink.cpp | 2 +- plugins/channelrx/demodfreedv/freedvdemod.cpp | 2 +- plugins/channelrx/demodnfm/nfmdemod.cpp | 4 ++-- plugins/channelrx/demodnfm/nfmdemodsink.cpp | 2 +- plugins/channelrx/demodpacket/packetdemod.cpp | 4 ++-- plugins/channelrx/demodpager/pagerdemod.cpp | 2 +- plugins/channelrx/demodradiosonde/radiosondedemod.cpp | 4 ++-- .../channelrx/demodradiosonde/radiosondedemodgui.cpp | 2 +- plugins/channelrx/demodssb/ssbdemod.cpp | 4 ++-- plugins/channelrx/demodssb/ssbdemodsink.cpp | 2 +- plugins/channelrx/demodvor/vordemod.cpp | 2 +- plugins/channelrx/demodvorsc/vordemodsc.cpp | 6 +++--- plugins/channelrx/demodwfm/wfmdemod.cpp | 4 ++-- plugins/channelrx/demodwfm/wfmdemodsink.cpp | 2 +- plugins/channelrx/filesink/filesink.cpp | 2 +- plugins/channelrx/freqtracker/freqtracker.cpp | 2 +- plugins/channelrx/localsink/localsink.cpp | 2 +- plugins/channelrx/radioastronomy/radioastronomygui.cpp | 6 +++--- plugins/channelrx/remotesink/remotesink.cpp | 2 +- plugins/channelrx/sigmffilesink/sigmffilesink.cpp | 2 +- plugins/channelrx/udpsink/udpsink.cpp | 2 +- plugins/channeltx/filesource/filesource.cpp | 2 +- plugins/channeltx/localsource/localsource.cpp | 2 +- plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp | 2 +- plugins/channeltx/modais/aismod.cpp | 4 ++-- plugins/channeltx/modais/aismodsource.cpp | 2 +- plugins/channeltx/modam/ammod.cpp | 4 ++-- plugins/channeltx/modam/ammodsource.cpp | 2 +- plugins/channeltx/modatv/atvmod.cpp | 2 +- plugins/channeltx/modchirpchat/chirpchatmod.cpp | 2 +- plugins/channeltx/moddatv/datvmod.cpp | 2 +- plugins/channeltx/modfreedv/freedvmod.cpp | 2 +- plugins/channeltx/modnfm/nfmmod.cpp | 4 ++-- plugins/channeltx/modnfm/nfmmodsource.cpp | 2 +- plugins/channeltx/modpacket/packetmod.cpp | 4 ++-- plugins/channeltx/modpacket/packetmodsource.cpp | 2 +- plugins/channeltx/modssb/ssbmod.cpp | 4 ++-- plugins/channeltx/modssb/ssbmodsource.cpp | 2 +- plugins/channeltx/modwfm/wfmmod.cpp | 4 ++-- plugins/channeltx/modwfm/wfmmodsource.cpp | 2 +- plugins/channeltx/remotesource/remotesource.cpp | 2 +- plugins/channeltx/udpsource/udpsource.cpp | 2 +- plugins/feature/afc/afc.cpp | 10 +++++----- plugins/feature/ais/aisgui.cpp | 2 +- plugins/feature/aprs/aprsgui.cpp | 2 +- plugins/feature/demodanalyzer/demodanalyzer.cpp | 6 +++--- .../feature/jogdialcontroller/jogdialcontroller.cpp | 2 +- plugins/feature/map/mapmodel.cpp | 2 +- plugins/feature/radiosonde/radiosondegui.cpp | 2 +- .../satellitetracker/satellitetrackerworker.cpp | 6 +++--- plugins/feature/startracker/startrackerworker.cpp | 4 ++-- plugins/feature/vorlocalizer/vorlocalizer.cpp | 2 +- sdrbase/maincore.h | 8 ++++---- sdrbase/pipes/pipeendpoint.cpp | 2 +- 71 files changed, 103 insertions(+), 103 deletions(-) diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp index 698e2bf9a..d2a4269a9 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp @@ -141,7 +141,7 @@ void BeamSteeringCWMod::applySettings(const BeamSteeringCWModSettings& settings, m_basebandSource->getInputMessageQueue()->push(msg); QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelmimo/interferometer/interferometer.cpp b/plugins/channelmimo/interferometer/interferometer.cpp index b96357bfe..dd5b13122 100644 --- a/plugins/channelmimo/interferometer/interferometer.cpp +++ b/plugins/channelmimo/interferometer/interferometer.cpp @@ -156,7 +156,7 @@ void Interferometer::applySettings(const InterferometerSettings& settings, bool } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index f346c1250..5dc7bf724 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -281,7 +281,7 @@ void ChannelAnalyzer::applySettings(const ChannelAnalyzerSettings& settings, boo } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/demodadsb/adsbdemod.cpp b/plugins/channelrx/demodadsb/adsbdemod.cpp index 49dcd9f81..74fda944b 100644 --- a/plugins/channelrx/demodadsb/adsbdemod.cpp +++ b/plugins/channelrx/demodadsb/adsbdemod.cpp @@ -756,7 +756,7 @@ void ADSBDemod::setTarget(const QString& name, float targetAzimuth, float target m_targetAzElValid = true; // Send to Rotator Controllers - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(this, "target"); if (mapMessageQueues) diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index ec50fb583..525c671e5 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -711,7 +711,7 @@ bool ADSBDemodGUI::updateLocalPosition(Aircraft *aircraft, double latitude, doub void ADSBDemodGUI::sendToMap(Aircraft *aircraft, QList *animations) { // Send to Map feature - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_adsbDemod, "mapitems"); if (mapMessageQueues) { @@ -4044,7 +4044,7 @@ void ADSBDemodGUI::tick() // Remove aircraft from hash i = m_aircraft.erase(i); // Remove from map feature - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_adsbDemod, "mapitems"); if (mapMessageQueues) { diff --git a/plugins/channelrx/demodais/aisdemod.cpp b/plugins/channelrx/demodais/aisdemod.cpp index 534e634bf..d411058e5 100644 --- a/plugins/channelrx/demodais/aisdemod.cpp +++ b/plugins/channelrx/demodais/aisdemod.cpp @@ -148,7 +148,7 @@ bool AISDemod::handleMessage(const Message& cmd) getMessageQueueToGUI()->push(msg); } - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); // Forward to AIS feature QList *aisMessageQueues = messagePipes.getMessageQueues(this, "ais"); @@ -363,7 +363,7 @@ bool AISDemod::deserialize(const QByteArray& data) void AISDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp index 113819ed4..ff2372f53 100644 --- a/plugins/channelrx/demodais/aisdemodgui.cpp +++ b/plugins/channelrx/demodais/aisdemodgui.cpp @@ -709,7 +709,7 @@ void AISDemodGUI::on_logOpen_clicked() bool cancelled = false; QStringList cols; - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *aisMessageQueues = messagePipes.getMessageQueues(m_aisDemod, "ais"); while (!cancelled && CSV::readRow(in, &cols)) diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index 92e702b7f..21fad24d0 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -250,7 +250,7 @@ void AMDemod::applySettings(const AMDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -284,7 +284,7 @@ bool AMDemod::deserialize(const QByteArray& data) void AMDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodam/amdemodsink.cpp b/plugins/channelrx/demodam/amdemodsink.cpp index d51fd4791..4e3cdea83 100644 --- a/plugins/channelrx/demodam/amdemodsink.cpp +++ b/plugins/channelrx/demodam/amdemodsink.cpp @@ -343,7 +343,7 @@ void AMDemodSink::applyAudioSampleRate(int sampleRate) m_pll.setSampleRate(sampleRate); QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodapt/aptdemodgui.cpp b/plugins/channelrx/demodapt/aptdemodgui.cpp index 531690aa2..18a9617c0 100644 --- a/plugins/channelrx/demodapt/aptdemodgui.cpp +++ b/plugins/channelrx/demodapt/aptdemodgui.cpp @@ -867,7 +867,7 @@ void APTDemodGUI::on_deleteImageFromMap_clicked() void APTDemodGUI::deleteImageFromMap(const QString &name) { - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_aptDemod, "mapitems"); if (mapMessageQueues) { diff --git a/plugins/channelrx/demodapt/aptdemodimageworker.cpp b/plugins/channelrx/demodapt/aptdemodimageworker.cpp index 0bf1497d9..53efd8447 100644 --- a/plugins/channelrx/demodapt/aptdemodimageworker.cpp +++ b/plugins/channelrx/demodapt/aptdemodimageworker.cpp @@ -661,7 +661,7 @@ void APTDemodImageWorker::makeTransparent(QImage &image) void APTDemodImageWorker::sendImageToMap(QImage image) { // Send to Map feature - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_aptDemod, "mapitems"); if (mapMessageQueues) { diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index 7d95a8fa0..cd79ede79 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -233,7 +233,7 @@ void BFMDemod::applySettings(const BFMDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp index cd6ce3b86..d271348d0 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp @@ -220,7 +220,7 @@ bool ChirpChatDemod::handleMessage(const Message& cmd) } // Forward to APRS and other packet features - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *packetMessageQueues = messagePipes.getMessageQueues(this, "packets"); if (packetMessageQueues) { @@ -474,7 +474,7 @@ void ChirpChatDemod::applySettings(const ChirpChatDemodSettings& settings, bool } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/demoddab/dabdemod.cpp b/plugins/channelrx/demoddab/dabdemod.cpp index 0091ca7d3..5acef85aa 100644 --- a/plugins/channelrx/demoddab/dabdemod.cpp +++ b/plugins/channelrx/demoddab/dabdemod.cpp @@ -370,7 +370,7 @@ bool DABDemod::deserialize(const QByteArray& data) void DABDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demoddab/dabdemodsink.cpp b/plugins/channelrx/demoddab/dabdemodsink.cpp index 70c57a0ac..f89e8200f 100644 --- a/plugins/channelrx/demoddab/dabdemodsink.cpp +++ b/plugins/channelrx/demoddab/dabdemodsink.cpp @@ -649,7 +649,7 @@ void DABDemodSink::applyAudioSampleRate(int sampleRate) m_audioFifo.setSize(sampleRate); QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demoddatv/datvdemod.cpp b/plugins/channelrx/demoddatv/datvdemod.cpp index 4e6233f3b..1fb98bbbd 100644 --- a/plugins/channelrx/demoddatv/datvdemod.cpp +++ b/plugins/channelrx/demoddatv/datvdemod.cpp @@ -249,7 +249,7 @@ void DATVDemod::applySettings(const DATVDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index 0fe0148d3..0d481f3d0 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -276,7 +276,7 @@ void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -310,7 +310,7 @@ bool DSDDemod::deserialize(const QByteArray& data) void DSDDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demoddsd/dsddemodsink.cpp b/plugins/channelrx/demoddsd/dsddemodsink.cpp index 0be93437f..b1d20df72 100644 --- a/plugins/channelrx/demoddsd/dsddemodsink.cpp +++ b/plugins/channelrx/demoddsd/dsddemodsink.cpp @@ -329,7 +329,7 @@ void DSDDemodSink::applyAudioSampleRate(int sampleRate) m_audioSampleRate = sampleRate; QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodfreedv/freedvdemod.cpp b/plugins/channelrx/demodfreedv/freedvdemod.cpp index 7e4ca8b35..6388653a7 100644 --- a/plugins/channelrx/demodfreedv/freedvdemod.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemod.cpp @@ -235,7 +235,7 @@ void FreeDVDemod::applySettings(const FreeDVDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 85792dfff..852395044 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -262,7 +262,7 @@ void NFMDemod::applySettings(const NFMDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -295,7 +295,7 @@ bool NFMDemod::deserialize(const QByteArray& data) void NFMDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodnfm/nfmdemodsink.cpp b/plugins/channelrx/demodnfm/nfmdemodsink.cpp index 4dc07c01f..a790e322c 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsink.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodsink.cpp @@ -410,7 +410,7 @@ void NFMDemodSink::applyAudioSampleRate(unsigned int sampleRate) m_audioSampleRate = sampleRate; QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodpacket/packetdemod.cpp b/plugins/channelrx/demodpacket/packetdemod.cpp index e2677b47b..e0ab5aa7a 100644 --- a/plugins/channelrx/demodpacket/packetdemod.cpp +++ b/plugins/channelrx/demodpacket/packetdemod.cpp @@ -156,7 +156,7 @@ bool PacketDemod::handleMessage(const Message& cmd) getMessageQueueToGUI()->push(msg); } - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); // Forward to APRS and other packet features QList *packetMessageQueues = messagePipes.getMessageQueues(this, "packets"); @@ -336,7 +336,7 @@ void PacketDemod::applySettings(const PacketDemodSettings& settings, bool force) void PacketDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodpager/pagerdemod.cpp b/plugins/channelrx/demodpager/pagerdemod.cpp index aebb36d39..bcabe7b1b 100644 --- a/plugins/channelrx/demodpager/pagerdemod.cpp +++ b/plugins/channelrx/demodpager/pagerdemod.cpp @@ -334,7 +334,7 @@ bool PagerDemod::deserialize(const QByteArray& data) void PagerDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodradiosonde/radiosondedemod.cpp b/plugins/channelrx/demodradiosonde/radiosondedemod.cpp index 5e965291c..bfe53a504 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemod.cpp +++ b/plugins/channelrx/demodradiosonde/radiosondedemod.cpp @@ -163,7 +163,7 @@ bool RadiosondeDemod::handleMessage(const Message& cmd) getMessageQueueToGUI()->push(msg); } - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); // Forward to Radiosonde feature QList *radiosondeMessageQueues = messagePipes.getMessageQueues(this, "radiosonde"); @@ -386,7 +386,7 @@ bool RadiosondeDemod::deserialize(const QByteArray& data) void RadiosondeDemod::sendSampleRateToDemodAnalyzer() { - QList *messageQueues = MainCore::instance()->getMessagePipes().getMessageQueues(this, "reportdemod"); + QList *messageQueues = MainCore::instance()->getMessagePipesLegacy().getMessageQueues(this, "reportdemod"); if (messageQueues) { diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp index a9ac324f3..cb7773eca 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp +++ b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp @@ -846,7 +846,7 @@ void RadiosondeDemodGUI::on_logOpen_clicked() bool cancelled = false; QStringList cols; - MessagePipesLegacy& framePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& framePipes = MainCore::instance()->getMessagePipesLegacy(); QList *radiosondeMessageQueues = framePipes.getMessageQueues(m_radiosondeDemod, "radiosonde"); while (!cancelled && CSV::readRow(in, &cols)) diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index 1bbd02301..f6f5a6bc1 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -271,7 +271,7 @@ void SSBDemod::applySettings(const SSBDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -305,7 +305,7 @@ bool SSBDemod::deserialize(const QByteArray& data) void SSBDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodssb/ssbdemodsink.cpp b/plugins/channelrx/demodssb/ssbdemodsink.cpp index c715baa0c..b5ba4ad25 100644 --- a/plugins/channelrx/demodssb/ssbdemodsink.cpp +++ b/plugins/channelrx/demodssb/ssbdemodsink.cpp @@ -311,7 +311,7 @@ void SSBDemodSink::applyAudioSampleRate(int sampleRate) QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodvor/vordemod.cpp b/plugins/channelrx/demodvor/vordemod.cpp index efce63409..63ba39229 100644 --- a/plugins/channelrx/demodvor/vordemod.cpp +++ b/plugins/channelrx/demodvor/vordemod.cpp @@ -215,7 +215,7 @@ void VORDemod::applySettings(const VORDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/demodvorsc/vordemodsc.cpp b/plugins/channelrx/demodvorsc/vordemodsc.cpp index a848a6ae4..c726f91a5 100644 --- a/plugins/channelrx/demodvorsc/vordemodsc.cpp +++ b/plugins/channelrx/demodvorsc/vordemodsc.cpp @@ -157,7 +157,7 @@ bool VORDemodSC::handleMessage(const Message& cmd) m_guiMessageQueue->push(msg); } - MessagePipes& messagePipes = MainCore::instance()->getMessagePipes2(); + MessagePipes& messagePipes = MainCore::instance()->getMessagePipes(); QList pipes; messagePipes.getMessagePipes(this, "report", pipes); @@ -178,7 +178,7 @@ bool VORDemodSC::handleMessage(const Message& cmd) m_guiMessageQueue->push(msg); } - MessagePipes& messagePipes = MainCore::instance()->getMessagePipes2(); + MessagePipes& messagePipes = MainCore::instance()->getMessagePipes(); QList pipes; messagePipes.getMessagePipes(this, "report", pipes); @@ -278,7 +278,7 @@ void VORDemodSC::applySettings(const VORDemodSCSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index d475d9cec..525b96054 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -237,7 +237,7 @@ void WFMDemod::applySettings(const WFMDemodSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -271,7 +271,7 @@ bool WFMDemod::deserialize(const QByteArray& data) void WFMDemod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/demodwfm/wfmdemodsink.cpp b/plugins/channelrx/demodwfm/wfmdemodsink.cpp index 1e8bfa3e8..2a71f8158 100644 --- a/plugins/channelrx/demodwfm/wfmdemodsink.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodsink.cpp @@ -181,7 +181,7 @@ void WFMDemodSink::applyAudioSampleRate(int sampleRate) m_audioSampleRate = sampleRate; QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channelrx/filesink/filesink.cpp b/plugins/channelrx/filesink/filesink.cpp index bc34a8d8b..721ccec57 100644 --- a/plugins/channelrx/filesink/filesink.cpp +++ b/plugins/channelrx/filesink/filesink.cpp @@ -315,7 +315,7 @@ void FileSink::applySettings(const FileSinkSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/freqtracker/freqtracker.cpp b/plugins/channelrx/freqtracker/freqtracker.cpp index 9a976c4fd..27bb33304 100644 --- a/plugins/channelrx/freqtracker/freqtracker.cpp +++ b/plugins/channelrx/freqtracker/freqtracker.cpp @@ -275,7 +275,7 @@ void FreqTracker::applySettings(const FreqTrackerSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/localsink/localsink.cpp b/plugins/channelrx/localsink/localsink.cpp index ca298d958..596785566 100644 --- a/plugins/channelrx/localsink/localsink.cpp +++ b/plugins/channelrx/localsink/localsink.cpp @@ -306,7 +306,7 @@ void LocalSink::applySettings(const LocalSinkSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.cpp b/plugins/channelrx/radioastronomy/radioastronomygui.cpp index 620d20923..862c17774 100644 --- a/plugins/channelrx/radioastronomy/radioastronomygui.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomygui.cpp @@ -1908,7 +1908,7 @@ void RadioAstronomyGUI::on_powerTable_cellDoubleClicked(int row, int column) if ((column >= POWER_COL_RA) && (column >= POWER_COL_EL)) { // Display target in Star Tracker - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *messageQueues = messagePipes.getMessageQueues(m_radioAstronomy, "startracker.display"); if (messageQueues) { @@ -4276,7 +4276,7 @@ void RadioAstronomyGUI::showLoSMarker(int row) void RadioAstronomyGUI::updateLoSMarker(const QString& name, float l, float b, float d) { // Send to Star Tracker - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *messageQueues = messagePipes.getMessageQueues(m_radioAstronomy, "startracker.display"); if (messageQueues) { @@ -4678,7 +4678,7 @@ void RadioAstronomyGUI::on_spectrumIndex_valueChanged(int value) ui->powerTable->scrollTo(ui->powerTable->model()->index(value, 0)); ui->spectrumDateTime->setDateTime(m_fftMeasurements[value]->m_dateTime); // Display target in Star Tracker - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *messageQueues = messagePipes.getMessageQueues(m_radioAstronomy, "startracker.display"); if (messageQueues) { diff --git a/plugins/channelrx/remotesink/remotesink.cpp b/plugins/channelrx/remotesink/remotesink.cpp index 4764dc18a..2038703ad 100644 --- a/plugins/channelrx/remotesink/remotesink.cpp +++ b/plugins/channelrx/remotesink/remotesink.cpp @@ -262,7 +262,7 @@ void RemoteSink::applySettings(const RemoteSinkSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp index 2ba4e2d63..2dc453687 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp @@ -315,7 +315,7 @@ void SigMFFileSink::applySettings(const SigMFFileSinkSettings& settings, bool fo } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channelrx/udpsink/udpsink.cpp b/plugins/channelrx/udpsink/udpsink.cpp index 904cf4d58..f20ea3ec0 100644 --- a/plugins/channelrx/udpsink/udpsink.cpp +++ b/plugins/channelrx/udpsink/udpsink.cpp @@ -252,7 +252,7 @@ void UDPSink::applySettings(const UDPSinkSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/filesource/filesource.cpp b/plugins/channeltx/filesource/filesource.cpp index c7f117f72..95ea9c8d8 100644 --- a/plugins/channeltx/filesource/filesource.cpp +++ b/plugins/channeltx/filesource/filesource.cpp @@ -265,7 +265,7 @@ void FileSource::applySettings(const FileSourceSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/localsource/localsource.cpp b/plugins/channeltx/localsource/localsource.cpp index 23b5e0efc..c61458fd4 100644 --- a/plugins/channeltx/localsource/localsource.cpp +++ b/plugins/channeltx/localsource/localsource.cpp @@ -309,7 +309,7 @@ void LocalSource::applySettings(const LocalSourceSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp index 0d4483ef0..f18fe5da7 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp @@ -376,7 +376,7 @@ void IEEE_802_15_4_Mod::applySettings(const IEEE_802_15_4_ModSettings& settings, } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/modais/aismod.cpp b/plugins/channeltx/modais/aismod.cpp index c8cc5a316..705dd204d 100644 --- a/plugins/channeltx/modais/aismod.cpp +++ b/plugins/channeltx/modais/aismod.cpp @@ -457,7 +457,7 @@ void AISMod::applySettings(const AISModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -490,7 +490,7 @@ bool AISMod::deserialize(const QByteArray& data) void AISMod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modais/aismodsource.cpp b/plugins/channeltx/modais/aismodsource.cpp index 033142bae..1fdf81b7f 100644 --- a/plugins/channeltx/modais/aismodsource.cpp +++ b/plugins/channeltx/modais/aismodsource.cpp @@ -365,7 +365,7 @@ void AISModSource::applyChannelSettings(int channelSampleRate, int channelFreque m_channelFrequencyOffset = channelFrequencyOffset; QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp index 9c6610941..b8002f5af 100644 --- a/plugins/channeltx/modam/ammod.cpp +++ b/plugins/channeltx/modam/ammod.cpp @@ -325,7 +325,7 @@ void AMMod::applySettings(const AMModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -359,7 +359,7 @@ bool AMMod::deserialize(const QByteArray& data) void AMMod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modam/ammodsource.cpp b/plugins/channeltx/modam/ammodsource.cpp index 481dc489f..8acc72b3e 100644 --- a/plugins/channeltx/modam/ammodsource.cpp +++ b/plugins/channeltx/modam/ammodsource.cpp @@ -322,7 +322,7 @@ void AMModSource::applyAudioSampleRate(int sampleRate) m_cwKeyer.reset(); QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp index ad2397531..fe92abaaa 100644 --- a/plugins/channeltx/modatv/atvmod.cpp +++ b/plugins/channeltx/modatv/atvmod.cpp @@ -338,7 +338,7 @@ void ATVMod::applySettings(const ATVModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.cpp b/plugins/channeltx/modchirpchat/chirpchatmod.cpp index b605969c8..e699d18af 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmod.cpp @@ -396,7 +396,7 @@ void ChirpChatMod::applySettings(const ChirpChatModSettings& settings, bool forc } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/moddatv/datvmod.cpp b/plugins/channeltx/moddatv/datvmod.cpp index 8b8cbdae5..f23bf1790 100644 --- a/plugins/channeltx/moddatv/datvmod.cpp +++ b/plugins/channeltx/moddatv/datvmod.cpp @@ -304,7 +304,7 @@ void DATVMod::applySettings(const DATVModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/modfreedv/freedvmod.cpp b/plugins/channeltx/modfreedv/freedvmod.cpp index 72ab1ad28..ad7debf29 100644 --- a/plugins/channeltx/modfreedv/freedvmod.cpp +++ b/plugins/channeltx/modfreedv/freedvmod.cpp @@ -318,7 +318,7 @@ void FreeDVMod::applySettings(const FreeDVModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp index a983dcab6..e9cf3d701 100644 --- a/plugins/channeltx/modnfm/nfmmod.cpp +++ b/plugins/channeltx/modnfm/nfmmod.cpp @@ -373,7 +373,7 @@ void NFMMod::applySettings(const NFMModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -406,7 +406,7 @@ bool NFMMod::deserialize(const QByteArray& data) void NFMMod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modnfm/nfmmodsource.cpp b/plugins/channeltx/modnfm/nfmmodsource.cpp index 7c1a21eac..a8b6e53ca 100644 --- a/plugins/channeltx/modnfm/nfmmodsource.cpp +++ b/plugins/channeltx/modnfm/nfmmodsource.cpp @@ -360,7 +360,7 @@ void NFMModSource::applyAudioSampleRate(int sampleRate) applyFeedbackAudioSampleRate(m_feedbackAudioSampleRate); QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp index 9dc095c79..47ef4caf4 100644 --- a/plugins/channeltx/modpacket/packetmod.cpp +++ b/plugins/channeltx/modpacket/packetmod.cpp @@ -407,7 +407,7 @@ void PacketMod::applySettings(const PacketModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -440,7 +440,7 @@ bool PacketMod::deserialize(const QByteArray& data) void PacketMod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modpacket/packetmodsource.cpp b/plugins/channeltx/modpacket/packetmodsource.cpp index 6258d4b4c..b08d57b12 100644 --- a/plugins/channeltx/modpacket/packetmodsource.cpp +++ b/plugins/channeltx/modpacket/packetmodsource.cpp @@ -418,7 +418,7 @@ void PacketModSource::applyChannelSettings(int channelSampleRate, int channelFre m_phaseSensitivity = 2.0f * M_PI * m_settings.m_fmDeviation / (double)m_channelSampleRate; QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp index 4f078e20b..e2d2db27d 100644 --- a/plugins/channeltx/modssb/ssbmod.cpp +++ b/plugins/channeltx/modssb/ssbmod.cpp @@ -346,7 +346,7 @@ void SSBMod::applySettings(const SSBModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -383,7 +383,7 @@ bool SSBMod::deserialize(const QByteArray& data) void SSBMod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modssb/ssbmodsource.cpp b/plugins/channeltx/modssb/ssbmodsource.cpp index b70155d8e..0dfd298a7 100644 --- a/plugins/channeltx/modssb/ssbmodsource.cpp +++ b/plugins/channeltx/modssb/ssbmodsource.cpp @@ -621,7 +621,7 @@ void SSBModSource::applyAudioSampleRate(int sampleRate) applyFeedbackAudioSampleRate(m_feedbackAudioSampleRate); QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp index 41d330034..1c3e21bdc 100644 --- a/plugins/channeltx/modwfm/wfmmod.cpp +++ b/plugins/channeltx/modwfm/wfmmod.cpp @@ -311,7 +311,7 @@ void WFMMod::applySettings(const WFMModSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); @@ -345,7 +345,7 @@ bool WFMMod::deserialize(const QByteArray& data) void WFMMod::sendSampleRateToDemodAnalyzer() { QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/modwfm/wfmmodsource.cpp b/plugins/channeltx/modwfm/wfmmodsource.cpp index 8e4d8e0b7..b195fd485 100644 --- a/plugins/channeltx/modwfm/wfmmodsource.cpp +++ b/plugins/channeltx/modwfm/wfmmodsource.cpp @@ -372,7 +372,7 @@ void WFMModSource::applyAudioSampleRate(int sampleRate) applyFeedbackAudioSampleRate(m_feedbackAudioSampleRate); QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes); if (pipes.size() > 0) { diff --git a/plugins/channeltx/remotesource/remotesource.cpp b/plugins/channeltx/remotesource/remotesource.cpp index b29974291..7df012e1f 100644 --- a/plugins/channeltx/remotesource/remotesource.cpp +++ b/plugins/channeltx/remotesource/remotesource.cpp @@ -244,7 +244,7 @@ void RemoteSource::applySettings(const RemoteSourceSettings& settings, bool forc } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/channeltx/udpsource/udpsource.cpp b/plugins/channeltx/udpsource/udpsource.cpp index 0506d9ae7..60b3a48ef 100644 --- a/plugins/channeltx/udpsource/udpsource.cpp +++ b/plugins/channeltx/udpsource/udpsource.cpp @@ -272,7 +272,7 @@ void UDPSource::applySettings(const UDPSourceSettings& settings, bool force) } QList pipes; - MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes); + MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes); if (pipes.size() > 0) { sendChannelSettings(pipes, reverseAPIKeys, settings, force); diff --git a/plugins/feature/afc/afc.cpp b/plugins/feature/afc/afc.cpp index b8c78656e..b66d1bc02 100644 --- a/plugins/feature/afc/afc.cpp +++ b/plugins/feature/afc/afc.cpp @@ -143,7 +143,7 @@ bool AFC::handleMessage(const Message& cmd) qDebug() << "AFC::handleMessage: MessagePipesLegacyCommon::MsgReportChannelDeleted"; MessagePipesLegacyCommon::MsgReportChannelDeleted& report = (MessagePipesLegacyCommon::MsgReportChannelDeleted&) cmd; const MessagePipesLegacyCommon::ChannelRegistrationKey& channelKey = report.getChannelRegistrationKey(); - MainCore::instance()->getMessagePipes().unregisterChannelToFeature(channelKey.m_key, this, "settings"); + MainCore::instance()->getMessagePipesLegacy().unregisterChannelToFeature(channelKey.m_key, this, "settings"); return true; } @@ -638,7 +638,7 @@ void AFC::trackerDeviceChange(int deviceIndex) if (channel->getURI() == "sdrangel.channel.freqtracker") { - ObjectPipe *pipe = mainCore->getMessagePipes2().registerProducerToConsumer(channel, this, "settings"); + ObjectPipe *pipe = mainCore->getMessagePipes().registerProducerToConsumer(channel, this, "settings"); MessageQueue *messageQueue = qobject_cast(pipe->m_element); if (messageQueue) @@ -687,7 +687,7 @@ void AFC::trackedDeviceChange(int deviceIndex) if (channel->getURI() != "sdrangel.channel.freqtracker") { - ObjectPipe *pipe = mainCore->getMessagePipes2().registerProducerToConsumer(channel, this, "settings"); + ObjectPipe *pipe = mainCore->getMessagePipes().registerProducerToConsumer(channel, this, "settings"); MessageQueue *messageQueue = qobject_cast(pipe->m_element); if (messageQueue) @@ -721,7 +721,7 @@ void AFC::removeTrackerFeatureReference() { if (m_trackerChannelAPI) { - ObjectPipe *pipe = MainCore::instance()->getMessagePipes2().unregisterProducerToConsumer(m_trackerChannelAPI, this, "settings"); + ObjectPipe *pipe = MainCore::instance()->getMessagePipes().unregisterProducerToConsumer(m_trackerChannelAPI, this, "settings"); if (pipe) { @@ -740,7 +740,7 @@ void AFC::removeTrackedFeatureReferences() { for (auto& channel : m_trackedChannelAPIs) { - ObjectPipe *pipe = MainCore::instance()->getMessagePipes2().unregisterProducerToConsumer(channel, this, "settings"); + ObjectPipe *pipe = MainCore::instance()->getMessagePipes().unregisterProducerToConsumer(channel, this, "settings"); if (pipe) { diff --git a/plugins/feature/ais/aisgui.cpp b/plugins/feature/ais/aisgui.cpp index c8ec612ae..6a43228e2 100644 --- a/plugins/feature/ais/aisgui.cpp +++ b/plugins/feature/ais/aisgui.cpp @@ -416,7 +416,7 @@ void AISGUI::sendToMap(const QString &name, const QString &label, float heading ) { - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_ais, "mapitems"); if (mapMessageQueues) { diff --git a/plugins/feature/aprs/aprsgui.cpp b/plugins/feature/aprs/aprsgui.cpp index 2fb159115..94121145e 100644 --- a/plugins/feature/aprs/aprsgui.cpp +++ b/plugins/feature/aprs/aprsgui.cpp @@ -337,7 +337,7 @@ bool APRSGUI::handleMessage(const Message& message) } // Forward to map - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_aprs, "mapitems"); if (mapMessageQueues) { diff --git a/plugins/feature/demodanalyzer/demodanalyzer.cpp b/plugins/feature/demodanalyzer/demodanalyzer.cpp index 0e763c59d..65e897cf6 100644 --- a/plugins/feature/demodanalyzer/demodanalyzer.cpp +++ b/plugins/feature/demodanalyzer/demodanalyzer.cpp @@ -272,7 +272,7 @@ void DemodAnalyzer::applySettings(const DemodAnalyzerSettings& settings, bool fo void DemodAnalyzer::updateChannels() { MainCore *mainCore = MainCore::instance(); - // MessagePipesLegacy& messagePipes = mainCore->getMessagePipes(); + // MessagePipesLegacy& messagePipes = mainCore->getMessagePipesLegacy(); std::vector& deviceSets = mainCore->getDeviceSets(); std::vector::const_iterator it = deviceSets.begin(); m_availableChannels.clear(); @@ -344,7 +344,7 @@ void DemodAnalyzer::setChannel(ChannelAPI *selectedChannel) m_worker->getInputMessageQueue()->push(msg); } - ObjectPipe *messagePipe = mainCore->getMessagePipes2().unregisterProducerToConsumer(m_selectedChannel, this, "reportdemod"); + ObjectPipe *messagePipe = mainCore->getMessagePipes().unregisterProducerToConsumer(m_selectedChannel, this, "reportdemod"); if (messagePipe) { @@ -371,7 +371,7 @@ void DemodAnalyzer::setChannel(ChannelAPI *selectedChannel) } } - ObjectPipe *messagePipe = mainCore->getMessagePipes2().registerProducerToConsumer(selectedChannel, this, "reportdemod"); + ObjectPipe *messagePipe = mainCore->getMessagePipes().registerProducerToConsumer(selectedChannel, this, "reportdemod"); if (messagePipe) { diff --git a/plugins/feature/jogdialcontroller/jogdialcontroller.cpp b/plugins/feature/jogdialcontroller/jogdialcontroller.cpp index be571bb0f..ae989a8eb 100644 --- a/plugins/feature/jogdialcontroller/jogdialcontroller.cpp +++ b/plugins/feature/jogdialcontroller/jogdialcontroller.cpp @@ -203,7 +203,7 @@ void JogdialController::applySettings(const JogdialControllerSettings& settings, void JogdialController::updateChannels() { MainCore *mainCore = MainCore::instance(); - // MessagePipesLegacy& messagePipes = mainCore->getMessagePipes(); + // MessagePipesLegacy& messagePipes = mainCore->getMessagePipesLegacy(); std::vector& deviceSets = mainCore->getDeviceSets(); std::vector::const_iterator it = deviceSets.begin(); m_availableChannels.clear(); diff --git a/plugins/feature/map/mapmodel.cpp b/plugins/feature/map/mapmodel.cpp index ebb1642fd..03d611369 100644 --- a/plugins/feature/map/mapmodel.cpp +++ b/plugins/feature/map/mapmodel.cpp @@ -358,7 +358,7 @@ void MapModel::updateTarget() azEl->calculate(); // Send to Rotator Controllers - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_gui->getMap(), "target"); if (mapMessageQueues) { diff --git a/plugins/feature/radiosonde/radiosondegui.cpp b/plugins/feature/radiosonde/radiosondegui.cpp index 84e055191..afc345f59 100644 --- a/plugins/feature/radiosonde/radiosondegui.cpp +++ b/plugins/feature/radiosonde/radiosondegui.cpp @@ -353,7 +353,7 @@ void RadiosondeGUI::sendToMap(const QString &name, const QString &label, float heading ) { - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_radiosonde, "mapitems"); if (mapMessageQueues) { diff --git a/plugins/feature/satellitetracker/satellitetrackerworker.cpp b/plugins/feature/satellitetracker/satellitetrackerworker.cpp index a5c6bbaa2..e0b107f0e 100644 --- a/plugins/feature/satellitetracker/satellitetrackerworker.cpp +++ b/plugins/feature/satellitetracker/satellitetrackerworker.cpp @@ -234,7 +234,7 @@ void SatelliteTrackerWorker::applySettings(const SatelliteTrackerSettings& setti void SatelliteTrackerWorker::removeFromMap(QString id) { - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_satelliteTracker, "mapitems"); if (mapMessageQueues) sendToMap(mapMessageQueues, id, "", "", "", 0.0f, 0.0, 0.0, 0.0, 0.0, nullptr, nullptr, nullptr, nullptr); @@ -405,7 +405,7 @@ void SatelliteTrackerWorker::update() azimuth = std::fmod(azimuth + 180.0, 360.0); elevation = 180.0 - elevation; } - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *rotatorMessageQueues = messagePipes.getMessageQueues(m_satelliteTracker, "target"); if (rotatorMessageQueues) { @@ -425,7 +425,7 @@ void SatelliteTrackerWorker::update() // Send to Map if (m_settings.m_drawOnMap) { - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_satelliteTracker, "mapitems"); if (mapMessageQueues) { diff --git a/plugins/feature/startracker/startrackerworker.cpp b/plugins/feature/startracker/startrackerworker.cpp index 6821e4291..a1f40c82b 100644 --- a/plugins/feature/startracker/startrackerworker.cpp +++ b/plugins/feature/startracker/startrackerworker.cpp @@ -407,7 +407,7 @@ void StarTrackerWorker::updateRaDec(RADec rd, QDateTime dt, bool lbTarget) void StarTrackerWorker::removeFromMap(QString id) { - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList *mapMessageQueues = messagePipes.getMessageQueues(m_starTracker, "mapitems"); if (mapMessageQueues) { sendToMap(mapMessageQueues, id, "", "", 0.0, 0.0); @@ -580,7 +580,7 @@ void StarTrackerWorker::update() } } - MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes(); + MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy(); QList* messageQueues; // Send Az/El to Rotator Controllers diff --git a/plugins/feature/vorlocalizer/vorlocalizer.cpp b/plugins/feature/vorlocalizer/vorlocalizer.cpp index 0c3798b3e..e63edac70 100644 --- a/plugins/feature/vorlocalizer/vorlocalizer.cpp +++ b/plugins/feature/vorlocalizer/vorlocalizer.cpp @@ -336,7 +336,7 @@ void VORLocalizer::applySettings(const VORLocalizerSettings& settings, bool forc void VORLocalizer::updateChannels() { MainCore *mainCore = MainCore::instance(); - MessagePipes& messagePipes = mainCore->getMessagePipes2(); + MessagePipes& messagePipes = mainCore->getMessagePipes(); std::vector& deviceSets = mainCore->getDeviceSets(); std::vector::const_iterator it = deviceSets.begin(); m_availableChannels.clear(); diff --git a/sdrbase/maincore.h b/sdrbase/maincore.h index c608a8c87..5f13f85c3 100644 --- a/sdrbase/maincore.h +++ b/sdrbase/maincore.h @@ -731,8 +731,8 @@ public: void removeFeatureInstance(Feature *feature); void clearFeatures(FeatureSet *featureSet); // pipes - MessagePipesLegacy& getMessagePipes() { return m_messagePipes; } - MessagePipes& getMessagePipes2() { return m_messagePipes2; } + MessagePipesLegacy& getMessagePipesLegacy() { return m_messagePipesLegacy; } + MessagePipes& getMessagePipes() { return m_messagePipes; } DataPipes& getDataPipes() { return m_dataPipes; } friend class MainServer; @@ -752,8 +752,8 @@ private: QMap m_channelsMap; //!< Channel to device set map QMap m_featuresMap; //!< Feature to feature set map PluginManager* m_pluginManager; - MessagePipesLegacy m_messagePipes; - MessagePipes m_messagePipes2; + MessagePipesLegacy m_messagePipesLegacy; + MessagePipes m_messagePipes; DataPipes m_dataPipes; void debugMaps(); diff --git a/sdrbase/pipes/pipeendpoint.cpp b/sdrbase/pipes/pipeendpoint.cpp index eae38fccd..9a3ba38eb 100644 --- a/sdrbase/pipes/pipeendpoint.cpp +++ b/sdrbase/pipes/pipeendpoint.cpp @@ -34,7 +34,7 @@ MESSAGE_CLASS_DEFINITION(PipeEndPoint::MsgReportPipes, Message) QList PipeEndPoint::updateAvailablePipeSources(QString pipeName, QStringList pipeTypes, QStringList pipeURIs, PipeEndPoint *destination) { MainCore *mainCore = MainCore::instance(); - MessagePipesLegacy& messagePipes = mainCore->getMessagePipes(); + MessagePipesLegacy& messagePipes = mainCore->getMessagePipesLegacy(); std::vector& deviceSets = mainCore->getDeviceSets(); QHash availablePipes;