mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-25 17:28:50 -05:00
Message pipes rework: more renaming
This commit is contained in:
parent
cbe643c0b1
commit
9c063410fb
@ -141,7 +141,7 @@ void BeamSteeringCWMod::applySettings(const BeamSteeringCWModSettings& settings,
|
||||
m_basebandSource->getInputMessageQueue()->push(msg);
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -156,7 +156,7 @@ void Interferometer::applySettings(const InterferometerSettings& settings, bool
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -281,7 +281,7 @@ void ChannelAnalyzer::applySettings(const ChannelAnalyzerSettings& settings, boo
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -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<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(this, "target");
|
||||
|
||||
if (mapMessageQueues)
|
||||
|
@ -711,7 +711,7 @@ bool ADSBDemodGUI::updateLocalPosition(Aircraft *aircraft, double latitude, doub
|
||||
void ADSBDemodGUI::sendToMap(Aircraft *aircraft, QList<SWGSDRangel::SWGMapAnimation *> *animations)
|
||||
{
|
||||
// Send to Map feature
|
||||
MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes();
|
||||
MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy();
|
||||
QList<MessageQueue*> *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<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(m_adsbDemod, "mapitems");
|
||||
if (mapMessageQueues)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *aisMessageQueues = messagePipes.getMessageQueues(this, "ais");
|
||||
@ -363,7 +363,7 @@ bool AISDemod::deserialize(const QByteArray& data)
|
||||
void AISDemod::sendSampleRateToDemodAnalyzer()
|
||||
{
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *aisMessageQueues = messagePipes.getMessageQueues(m_aisDemod, "ais");
|
||||
|
||||
while (!cancelled && CSV::readRow(in, &cols))
|
||||
|
@ -250,7 +250,7 @@ void AMDemod::applySettings(const AMDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -343,7 +343,7 @@ void AMDemodSink::applyAudioSampleRate(int sampleRate)
|
||||
m_pll.setSampleRate(sampleRate);
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(m_aptDemod, "mapitems");
|
||||
if (mapMessageQueues)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(m_aptDemod, "mapitems");
|
||||
if (mapMessageQueues)
|
||||
{
|
||||
|
@ -233,7 +233,7 @@ void BFMDemod::applySettings(const BFMDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -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<MessageQueue*> *packetMessageQueues = messagePipes.getMessageQueues(this, "packets");
|
||||
if (packetMessageQueues)
|
||||
{
|
||||
@ -474,7 +474,7 @@ void ChirpChatDemod::applySettings(const ChirpChatDemodSettings& settings, bool
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -370,7 +370,7 @@ bool DABDemod::deserialize(const QByteArray& data)
|
||||
void DABDemod::sendSampleRateToDemodAnalyzer()
|
||||
{
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -649,7 +649,7 @@ void DABDemodSink::applyAudioSampleRate(int sampleRate)
|
||||
m_audioFifo.setSize(sampleRate);
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -249,7 +249,7 @@ void DATVDemod::applySettings(const DATVDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -276,7 +276,7 @@ void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -329,7 +329,7 @@ void DSDDemodSink::applyAudioSampleRate(int sampleRate)
|
||||
m_audioSampleRate = sampleRate;
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -235,7 +235,7 @@ void FreeDVDemod::applySettings(const FreeDVDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -262,7 +262,7 @@ void NFMDemod::applySettings(const NFMDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -410,7 +410,7 @@ void NFMDemodSink::applyAudioSampleRate(unsigned int sampleRate)
|
||||
m_audioSampleRate = sampleRate;
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *packetMessageQueues = messagePipes.getMessageQueues(this, "packets");
|
||||
@ -336,7 +336,7 @@ void PacketDemod::applySettings(const PacketDemodSettings& settings, bool force)
|
||||
void PacketDemod::sendSampleRateToDemodAnalyzer()
|
||||
{
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -334,7 +334,7 @@ bool PagerDemod::deserialize(const QByteArray& data)
|
||||
void PagerDemod::sendSampleRateToDemodAnalyzer()
|
||||
{
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *radiosondeMessageQueues = messagePipes.getMessageQueues(this, "radiosonde");
|
||||
@ -386,7 +386,7 @@ bool RadiosondeDemod::deserialize(const QByteArray& data)
|
||||
|
||||
void RadiosondeDemod::sendSampleRateToDemodAnalyzer()
|
||||
{
|
||||
QList<MessageQueue*> *messageQueues = MainCore::instance()->getMessagePipes().getMessageQueues(this, "reportdemod");
|
||||
QList<MessageQueue*> *messageQueues = MainCore::instance()->getMessagePipesLegacy().getMessageQueues(this, "reportdemod");
|
||||
|
||||
if (messageQueues)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *radiosondeMessageQueues = framePipes.getMessageQueues(m_radiosondeDemod, "radiosonde");
|
||||
|
||||
while (!cancelled && CSV::readRow(in, &cols))
|
||||
|
@ -271,7 +271,7 @@ void SSBDemod::applySettings(const SSBDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -311,7 +311,7 @@ void SSBDemodSink::applyAudioSampleRate(int sampleRate)
|
||||
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -215,7 +215,7 @@ void VORDemod::applySettings(const VORDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -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<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
messagePipes.getMessagePipes(this, "report", pipes);
|
||||
|
||||
@ -278,7 +278,7 @@ void VORDemodSC::applySettings(const VORDemodSCSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -237,7 +237,7 @@ void WFMDemod::applySettings(const WFMDemodSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -181,7 +181,7 @@ void WFMDemodSink::applyAudioSampleRate(int sampleRate)
|
||||
m_audioSampleRate = sampleRate;
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -315,7 +315,7 @@ void FileSink::applySettings(const FileSinkSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -275,7 +275,7 @@ void FreqTracker::applySettings(const FreqTrackerSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -306,7 +306,7 @@ void LocalSink::applySettings(const LocalSinkSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -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<MessageQueue*> *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<MessageQueue*> *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<MessageQueue*> *messageQueues = messagePipes.getMessageQueues(m_radioAstronomy, "startracker.display");
|
||||
if (messageQueues)
|
||||
{
|
||||
|
@ -262,7 +262,7 @@ void RemoteSink::applySettings(const RemoteSinkSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -315,7 +315,7 @@ void SigMFFileSink::applySettings(const SigMFFileSinkSettings& settings, bool fo
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -252,7 +252,7 @@ void UDPSink::applySettings(const UDPSinkSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -265,7 +265,7 @@ void FileSource::applySettings(const FileSourceSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -309,7 +309,7 @@ void LocalSource::applySettings(const LocalSourceSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -376,7 +376,7 @@ void IEEE_802_15_4_Mod::applySettings(const IEEE_802_15_4_ModSettings& settings,
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -457,7 +457,7 @@ void AISMod::applySettings(const AISModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -365,7 +365,7 @@ void AISModSource::applyChannelSettings(int channelSampleRate, int channelFreque
|
||||
m_channelFrequencyOffset = channelFrequencyOffset;
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -325,7 +325,7 @@ void AMMod::applySettings(const AMModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -322,7 +322,7 @@ void AMModSource::applyAudioSampleRate(int sampleRate)
|
||||
m_cwKeyer.reset();
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -338,7 +338,7 @@ void ATVMod::applySettings(const ATVModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -396,7 +396,7 @@ void ChirpChatMod::applySettings(const ChirpChatModSettings& settings, bool forc
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -304,7 +304,7 @@ void DATVMod::applySettings(const DATVModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -318,7 +318,7 @@ void FreeDVMod::applySettings(const FreeDVModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -373,7 +373,7 @@ void NFMMod::applySettings(const NFMModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -360,7 +360,7 @@ void NFMModSource::applyAudioSampleRate(int sampleRate)
|
||||
applyFeedbackAudioSampleRate(m_feedbackAudioSampleRate);
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -407,7 +407,7 @@ void PacketMod::applySettings(const PacketModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -346,7 +346,7 @@ void SSBMod::applySettings(const SSBModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -621,7 +621,7 @@ void SSBModSource::applyAudioSampleRate(int sampleRate)
|
||||
applyFeedbackAudioSampleRate(m_feedbackAudioSampleRate);
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -311,7 +311,7 @@ void WFMMod::applySettings(const WFMModSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> 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<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -372,7 +372,7 @@ void WFMModSource::applyAudioSampleRate(int sampleRate)
|
||||
applyFeedbackAudioSampleRate(m_feedbackAudioSampleRate);
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(m_channel, "reportdemod", pipes);
|
||||
|
||||
if (pipes.size() > 0)
|
||||
{
|
||||
|
@ -244,7 +244,7 @@ void RemoteSource::applySettings(const RemoteSourceSettings& settings, bool forc
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -272,7 +272,7 @@ void UDPSource::applySettings(const UDPSourceSettings& settings, bool force)
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes2().getMessagePipes(this, "settings", pipes);
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
|
@ -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<MessageQueue*>(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<MessageQueue*>(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)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(m_ais, "mapitems");
|
||||
if (mapMessageQueues)
|
||||
{
|
||||
|
@ -337,7 +337,7 @@ bool APRSGUI::handleMessage(const Message& message)
|
||||
}
|
||||
|
||||
// Forward to map
|
||||
MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes();
|
||||
MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy();
|
||||
QList<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(m_aprs, "mapitems");
|
||||
if (mapMessageQueues)
|
||||
{
|
||||
|
@ -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<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
|
||||
std::vector<DeviceSet*>::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)
|
||||
{
|
||||
|
@ -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<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
|
||||
std::vector<DeviceSet*>::const_iterator it = deviceSets.begin();
|
||||
m_availableChannels.clear();
|
||||
|
@ -358,7 +358,7 @@ void MapModel::updateTarget()
|
||||
azEl->calculate();
|
||||
|
||||
// Send to Rotator Controllers
|
||||
MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipes();
|
||||
MessagePipesLegacy& messagePipes = MainCore::instance()->getMessagePipesLegacy();
|
||||
QList<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(m_gui->getMap(), "target");
|
||||
if (mapMessageQueues)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(m_radiosonde, "mapitems");
|
||||
if (mapMessageQueues)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *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<MessageQueue*> *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<MessageQueue*> *mapMessageQueues = messagePipes.getMessageQueues(m_satelliteTracker, "mapitems");
|
||||
if (mapMessageQueues)
|
||||
{
|
||||
|
@ -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<MessageQueue*> *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<MessageQueue*>* messageQueues;
|
||||
|
||||
// Send Az/El to Rotator Controllers
|
||||
|
@ -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<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
|
||||
std::vector<DeviceSet*>::const_iterator it = deviceSets.begin();
|
||||
m_availableChannels.clear();
|
||||
|
@ -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<ChannelAPI*, DeviceSet*> m_channelsMap; //!< Channel to device set map
|
||||
QMap<Feature*, FeatureSet*> 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();
|
||||
|
@ -34,7 +34,7 @@ MESSAGE_CLASS_DEFINITION(PipeEndPoint::MsgReportPipes, Message)
|
||||
QList<PipeEndPoint::AvailablePipeSource> PipeEndPoint::updateAvailablePipeSources(QString pipeName, QStringList pipeTypes, QStringList pipeURIs, PipeEndPoint *destination)
|
||||
{
|
||||
MainCore *mainCore = MainCore::instance();
|
||||
MessagePipesLegacy& messagePipes = mainCore->getMessagePipes();
|
||||
MessagePipesLegacy& messagePipes = mainCore->getMessagePipesLegacy();
|
||||
std::vector<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
|
||||
QHash<PipeEndPoint *, AvailablePipeSource> availablePipes;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user