From 7b63657fb72bf95a022821ee6a06330dc2725345 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 4 Jun 2017 08:47:58 +0200 Subject: [PATCH] SDRdaemonSink: basic message receive from remote --- plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp | 10 ++++++++++ plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp index f7967db19..56cdc7f86 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp @@ -522,7 +522,17 @@ void SDRdaemonSinkGui::tick() { if ((++m_tickCount & 0xf) == 0) { + void *msgBuf = 0; + SDRdaemonSinkOutput::MsgConfigureSDRdaemonSinkStreamTiming* message = SDRdaemonSinkOutput::MsgConfigureSDRdaemonSinkStreamTiming::create(); m_deviceSampleSink->getInputMessageQueue()->push(message); + + int len = nn_recv(m_nnSender, &msgBuf, NN_MSG, NN_DONTWAIT); + + if ((len > 0) && msgBuf) + { + std::string msg((char *) msgBuf, len); + qDebug("SDRdaemonSinkGui::tick: received NN msg: %s", msg.c_str()); + } } } diff --git a/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp b/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp index 2ce4a6d81..43750e2f2 100644 --- a/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp +++ b/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp @@ -263,7 +263,7 @@ void UDPSinkFECWorker::encodeAndTransmit(UDPSinkFEC::SuperBlock *txBlockx, uint1 if ((nbBlocksFEC == 0) || !m_cm256Valid) { - qDebug("UDPSinkFECWorker::encodeAndTransmit: transmit frame without FEC to %s:%d", m_remoteAddress.toStdString().c_str(), m_remotePort); +// qDebug("UDPSinkFECWorker::encodeAndTransmit: transmit frame without FEC to %s:%d", m_remoteAddress.toStdString().c_str(), m_remotePort); for (unsigned int i = 0; i < UDPSinkFEC::m_nbOriginalBlocks; i++) { @@ -307,7 +307,7 @@ void UDPSinkFECWorker::encodeAndTransmit(UDPSinkFEC::SuperBlock *txBlockx, uint1 // Transmit all blocks - qDebug("UDPSinkFECWorker::encodeAndTransmit: transmit frame with FEC to %s:%d", m_remoteAddress.toStdString().c_str(), m_remotePort); +// qDebug("UDPSinkFECWorker::encodeAndTransmit: transmit frame with FEC to %s:%d", m_remoteAddress.toStdString().c_str(), m_remotePort); for (int i = 0; i < cm256Params.OriginalCount + cm256Params.RecoveryCount; i++) {