From 680c584fe0016b41fa72955b524ca92f42e7558d Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 4 Jan 2019 10:49:47 +0100 Subject: [PATCH] Device engines: unified some debug messages --- sdrbase/dsp/dspdevicesinkengine.cpp | 14 +++++++++----- sdrbase/dsp/dspdevicesourceengine.cpp | 8 ++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sdrbase/dsp/dspdevicesinkengine.cpp b/sdrbase/dsp/dspdevicesinkengine.cpp index aa6b4246f..55ef40ad8 100644 --- a/sdrbase/dsp/dspdevicesinkengine.cpp +++ b/sdrbase/dsp/dspdevicesinkengine.cpp @@ -523,8 +523,6 @@ void DSPDeviceSinkEngine::handleSynchronousMessages() void DSPDeviceSinkEngine::handleInputMessages() { - qDebug() << "DSPDeviceSinkEngine::handleInputMessages"; - Message* message; while ((message = m_inputMessageQueue.pop()) != 0) @@ -540,7 +538,9 @@ void DSPDeviceSinkEngine::handleInputMessages() m_sampleRate = notif->getSampleRate(); m_centerFrequency = notif->getCenterFrequency(); - qDebug() << "DSPDeviceSinkEngine::handleInputMessages: DSPSignalNotification(" << m_sampleRate << "," << m_centerFrequency << ")"; + qDebug() << "DSPDeviceSinkEngine::handleInputMessages: DSPSignalNotification:" + << " m_sampleRate: " << m_sampleRate + << " m_centerFrequency: " << m_centerFrequency; // forward source changes to sources with immediate execution @@ -557,10 +557,14 @@ void DSPDeviceSinkEngine::handleInputMessages() } // forward changes to listeners on DSP output queue - if (m_deviceSampleSink->getMessageQueueToGUI()) + + MessageQueue *guiMessageQueue = m_deviceSampleSink->getMessageQueueToGUI(); + qDebug("DSPDeviceSinkEngine::handleInputMessages: DSPSignalNotification: guiMessageQueue: %p", guiMessageQueue); + + if (guiMessageQueue) { DSPSignalNotification* rep = new DSPSignalNotification(*notif); // make a copy for the output queue - m_deviceSampleSink->getMessageQueueToGUI()->push(rep); + guiMessageQueue->push(rep); } delete message; diff --git a/sdrbase/dsp/dspdevicesourceengine.cpp b/sdrbase/dsp/dspdevicesourceengine.cpp index 87a9f1514..7d38ba173 100644 --- a/sdrbase/dsp/dspdevicesourceengine.cpp +++ b/sdrbase/dsp/dspdevicesourceengine.cpp @@ -684,8 +684,6 @@ void DSPDeviceSourceEngine::handleSynchronousMessages() void DSPDeviceSourceEngine::handleInputMessages() { - qDebug() << "DSPDeviceSourceEngine::handleInputMessages"; - Message* message; while ((message = m_inputMessageQueue.pop()) != 0) @@ -732,7 +730,9 @@ void DSPDeviceSourceEngine::handleInputMessages() m_sampleRate = notif->getSampleRate(); m_centerFrequency = notif->getCenterFrequency(); - qDebug() << "DSPDeviceSourceEngine::handleInputMessages: DSPSignalNotification(" << m_sampleRate << "," << m_centerFrequency << ")"; + qDebug() << "DSPDeviceSourceEngine::handleInputMessages: DSPSignalNotification:" + << " m_sampleRate: " << m_sampleRate + << " m_centerFrequency: " << m_centerFrequency; // forward source changes to channel sinks with immediate execution (no queuing) @@ -755,7 +755,7 @@ void DSPDeviceSourceEngine::handleInputMessages() if (guiMessageQueue) { DSPSignalNotification* rep = new DSPSignalNotification(*notif); // make a copy for the source GUI - m_deviceSampleSource->getMessageQueueToGUI()->push(rep); + guiMessageQueue->push(rep); } //m_outputMessageQueue.push(rep);