From 8412260d5a4658453f27555dbb3750fafe047c2d Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 25 Oct 2019 18:24:03 +0200 Subject: [PATCH] Test Sink fixes --- plugins/samplesink/testsink/testsinkgui.cpp | 5 ++--- plugins/samplesink/testsink/testsinkgui.h | 2 -- plugins/samplesink/testsink/testsinkplugin.cpp | 2 +- plugins/samplesink/testsink/testsinkthread.cpp | 7 ------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/plugins/samplesink/testsink/testsinkgui.cpp b/plugins/samplesink/testsink/testsinkgui.cpp index 07a1eda13..de0da1327 100644 --- a/plugins/samplesink/testsink/testsinkgui.cpp +++ b/plugins/samplesink/testsink/testsinkgui.cpp @@ -139,7 +139,7 @@ bool TestSinkGui::handleMessage(const Message& message) else if (TestSinkOutput::MsgStartStop::match(message)) { TestSinkOutput::MsgStartStop& notif = (TestSinkOutput::MsgStartStop&) message; - qDebug("TestSinkOutput::handleMessage: message: MsgStartStop: %s", notif.getStartStop() ? "start" : "stop"); + qDebug("TestSinkGui::handleMessage: message: MsgStartStop: %s", notif.getStartStop() ? "start" : "stop"); blockApplySettings(true); ui->startStop->setChecked(notif.getStartStop()); blockApplySettings(false); @@ -161,7 +161,7 @@ void TestSinkGui::handleInputMessages() if (DSPSignalNotification::match(*message)) { DSPSignalNotification* notif = (DSPSignalNotification*) message; - qDebug("FileSinkGui::handleInputMessages: DSPSignalNotification: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency()); + qDebug("TestSinkGui::handleInputMessages: DSPSignalNotification: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency()); m_sampleRate = notif->getSampleRate(); m_deviceCenterFrequency = notif->getCenterFrequency(); updateSampleRateAndFrequency(); @@ -198,7 +198,6 @@ void TestSinkGui::sendSettings() } } - void TestSinkGui::updateHardware() { qDebug() << "TestSinkGui::updateHardware"; diff --git a/plugins/samplesink/testsink/testsinkgui.h b/plugins/samplesink/testsink/testsinkgui.h index 98e9fed71..8a9ad0bc7 100644 --- a/plugins/samplesink/testsink/testsinkgui.h +++ b/plugins/samplesink/testsink/testsinkgui.h @@ -74,9 +74,7 @@ private: void blockApplySettings(bool block) { m_doApplySettings = !block; } void displaySettings(); - void displayTime(); void sendSettings(); - void configureFileName(); void updateSampleRateAndFrequency(); private slots: diff --git a/plugins/samplesink/testsink/testsinkplugin.cpp b/plugins/samplesink/testsink/testsinkplugin.cpp index 8680aa21b..3d835d604 100644 --- a/plugins/samplesink/testsink/testsinkplugin.cpp +++ b/plugins/samplesink/testsink/testsinkplugin.cpp @@ -28,7 +28,7 @@ #include "testsinkplugin.h" const PluginDescriptor TestSinkPlugin::m_pluginDescriptor = { - QString("Test sink output"), + QString("Test Sink Output"), QString("4.11.12"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), diff --git a/plugins/samplesink/testsink/testsinkthread.cpp b/plugins/samplesink/testsink/testsinkthread.cpp index 8c43feef7..50c0bab58 100644 --- a/plugins/samplesink/testsink/testsinkthread.cpp +++ b/plugins/samplesink/testsink/testsinkthread.cpp @@ -167,12 +167,6 @@ void TestSinkThread::tick() m_throttleToggle = !m_throttleToggle; } -// if (m_throttlems > m_maxThrottlems) -// { -// qDebug("FileSinkThread::tick: m_maxThrottlems: %d", m_maxThrottlems); -// m_maxThrottlems = m_throttlems; -// } - SampleVector::iterator readUntil; m_sampleFifo->readAdvance(readUntil, m_samplesChunkSize); @@ -214,6 +208,5 @@ void TestSinkThread::tick() //m_ofstream->write(reinterpret_cast(m_buf), m_samplesChunkSize*(1<