From 7a1fa085c54543f435a7fc8ffd3b1e9d26503cdd Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 10 Sep 2019 08:41:29 +0200
Subject: [PATCH] Fallen back changes made in v4.11.7: Use a simplified version
 of sample FIFOs in the threaded baseband sample sink

---
 sdrbase/dsp/threadedbasebandsamplesink.cpp | 18 ++----------------
 sdrbase/dsp/threadedbasebandsamplesink.h   |  3 ---
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/sdrbase/dsp/threadedbasebandsamplesink.cpp b/sdrbase/dsp/threadedbasebandsamplesink.cpp
index 2dfd2787f..cce47ec6a 100644
--- a/sdrbase/dsp/threadedbasebandsamplesink.cpp
+++ b/sdrbase/dsp/threadedbasebandsamplesink.cpp
@@ -8,8 +8,7 @@
 ThreadedBasebandSampleSinkFifo::ThreadedBasebandSampleSinkFifo(BasebandSampleSink *sampleSink, std::size_t size) :
 	m_sampleSink(sampleSink)
 {
-	//connect(&m_sampleFifo, SIGNAL(dataReady()), this, SLOT(handleFifoData()));
-    connect(&m_sampleVector, SIGNAL(dataReady()), this, SLOT(handleVectorData()));
+	connect(&m_sampleFifo, SIGNAL(dataReady()), this, SLOT(handleFifoData()));
 	m_sampleFifo.setSize(size);
 }
 
@@ -20,20 +19,7 @@ ThreadedBasebandSampleSinkFifo::~ThreadedBasebandSampleSinkFifo()
 
 void ThreadedBasebandSampleSinkFifo::writeToFifo(SampleVector::const_iterator& begin, SampleVector::const_iterator& end)
 {
-	//m_sampleFifo.write(begin, end);
-    m_sampleVector.write(begin, end);
-}
-
-void ThreadedBasebandSampleSinkFifo::handleVectorData()
-{
-    SampleVector::iterator vbegin;
-    SampleVector::iterator vend;
-
-    if (m_sampleSink)
-    {
-        m_sampleVector.read(vbegin, vend);
-        m_sampleSink->feed(vbegin, vend, false);
-    }
+	m_sampleFifo.write(begin, end);
 }
 
 void ThreadedBasebandSampleSinkFifo::handleFifoData() // FIXME: Fixed? Move it to the new threadable sink class
diff --git a/sdrbase/dsp/threadedbasebandsamplesink.h b/sdrbase/dsp/threadedbasebandsamplesink.h
index 6c4acf814..d398a0da0 100644
--- a/sdrbase/dsp/threadedbasebandsamplesink.h
+++ b/sdrbase/dsp/threadedbasebandsamplesink.h
@@ -23,7 +23,6 @@
 #include <QMutex>
 
 #include "samplesinkfifo.h"
-#include "samplesinkvector.h"
 #include "util/messagequeue.h"
 #include "export.h"
 
@@ -44,11 +43,9 @@ public:
 
 	BasebandSampleSink* m_sampleSink;
 	SampleSinkFifo m_sampleFifo;
-    SampleSinkVector m_sampleVector;
 
 public slots:
 	void handleFifoData();
-    void handleVectorData();
 };
 
 /**