From bcec558929b4603050a31fc70227590c80f90d5e Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Fri, 13 Aug 2021 23:17:17 -0700 Subject: [PATCH] Missing link in the signal slot connection is fixed. wfmain now receives information about the plugins that exist. --- rigcommander.cpp | 2 +- udphandler.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/rigcommander.cpp b/rigcommander.cpp index d5a670e..c52cad0 100644 --- a/rigcommander.cpp +++ b/rigcommander.cpp @@ -104,7 +104,7 @@ void rigCommander::commSetup(unsigned char rigCivAddr, udpPreferences prefs, aud // Plugin: connect(udp, &udpHandler::havePluginInstanceInfo, [=](const pluginInstanceInfoType info) { - qDebug(logRig()) << "Passing plugin information from rig to wfview."; + qDebug(logRig()) << __PRETTY_FUNCTION__ << "Passing plugin information from rig to wfview."; emit sendPluginInstanceInfo(info); }); diff --git a/udphandler.cpp b/udphandler.cpp index 11d7b0c..f0fb2c5 100644 --- a/udphandler.cpp +++ b/udphandler.cpp @@ -333,6 +333,12 @@ void udpHandler::dataReceived() QObject::connect(this, SIGNAL(haveChangeLatency(quint16)), audio, SLOT(changeLatency(quint16))); QObject::connect(this, SIGNAL(haveSetVolume(unsigned char)), audio, SLOT(setVolume(unsigned char))); + connect(audio, &udpAudio::havePluginInstanceInfo, + [=](const pluginInstanceInfoType info) { + emit havePluginInstanceInfo(info); + qDebug(logUdp()) << __PRETTY_FUNCTION__ << "Passing plugin info from udpHandler to rig"; + }); + streamOpened = true; emit haveNetworkStatus(devName); @@ -769,12 +775,12 @@ udpAudio::udpAudio(QHostAddress local, QHostAddress ip, quint16 audioPort, audio connect(rxaudio, &audioHandler::havePluginInfo, [=](const pluginInstanceInfoType info) { emit havePluginInstanceInfo(info); - qDebug(logUdp()) << "Passing plugin info from udp handler to rig"; + qDebug(logUdp()) << __PRETTY_FUNCTION__ << "Passing RX plugin info from udp audio handler to udpHandler"; }); connect(txaudio, &audioHandler::havePluginInfo, [=](const pluginInstanceInfoType info) { emit havePluginInstanceInfo(info); - qDebug(logUdp()) << "Passing plugin info from udp handler to rig"; + qDebug(logUdp()) << __PRETTY_FUNCTION__ << "Passing TX plugin info from udp audio handler to udpHandler"; }); }