From 3792398c8ba12a24dcb88fa421d5ef24720744c6 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 26 Apr 2021 19:32:38 +0200 Subject: [PATCH] Removed SampleSourceFifoDB from build --- sdrbase/CMakeLists.txt | 2 -- sdrbase/dsp/dspdevicemimoengine.cpp | 16 ---------------- 2 files changed, 18 deletions(-) diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index 15e1c9016..1320e42d7 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -139,7 +139,6 @@ set(sdrbase_SOURCES dsp/samplesinkfifo.cpp dsp/samplesimplefifo.cpp dsp/samplesourcefifo.cpp - dsp/samplesourcefifodb.cpp dsp/basebandsamplesink.cpp dsp/basebandsamplesource.cpp dsp/nullsink.cpp @@ -331,7 +330,6 @@ set(sdrbase_HEADERS dsp/samplesinkfifo.h dsp/samplesimplefifo.h dsp/samplesourcefifo.h - dsp/samplesourcefifodb.h dsp/basebandsamplesink.h dsp/basebandsamplesource.h dsp/nullsink.h diff --git a/sdrbase/dsp/dspdevicemimoengine.cpp b/sdrbase/dsp/dspdevicemimoengine.cpp index a486b071e..6f25f2ec9 100644 --- a/sdrbase/dsp/dspdevicemimoengine.cpp +++ b/sdrbase/dsp/dspdevicemimoengine.cpp @@ -1063,13 +1063,6 @@ void DSPDeviceMIMOEngine::handleSynchronousMessages() { BasebandSampleSink* spectrumSink = ((DSPRemoveSpectrumSink*) message)->getSampleSink(); spectrumSink->stop(); - - // if (!m_spectrumInputSourceElseSink && m_deviceSampleMIMO && (m_spectrumInputIndex < m_deviceSampleMIMO->getNbSinkStreams())) - // { - // SampleSourceFifoDB *inputFIFO = m_deviceSampleMIMO->getSampleSourceFifo(m_spectrumInputIndex); - // disconnect(inputFIFO, SIGNAL(dataRead(int)), this, SLOT(handleForwardToSpectrumSink(int))); - // } - m_spectrumSink = nullptr; } else if (SetSpectrumSinkInput::match(*message)) @@ -1080,17 +1073,8 @@ void DSPDeviceMIMOEngine::handleSynchronousMessages() if ((spectrumInputSourceElseSink != m_spectrumInputSourceElseSink) || (spectrumInputIndex != m_spectrumInputIndex)) { - // if (!m_spectrumInputSourceElseSink) // remove the source listener - // { - // SampleSourceFifoDB *inputFIFO = m_deviceSampleMIMO->getSampleSourceFifo(m_spectrumInputIndex); - // disconnect(inputFIFO, SIGNAL(dataRead(int)), this, SLOT(handleForwardToSpectrumSink(int))); - // } - if ((!spectrumInputSourceElseSink) && (spectrumInputIndex < m_deviceSampleMIMO->getNbSinkStreams())) // add the source listener { - // SampleSourceFifoDB *inputFIFO = m_deviceSampleMIMO->getSampleSourceFifo(spectrumInputIndex); - // connect(inputFIFO, SIGNAL(dataRead(int)), this, SLOT(handleForwardToSpectrumSink(int))); - if (m_spectrumSink) { DSPSignalNotification notif(