VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-30 12:42:25 -04:00
Code Issues Projects Releases Wiki Activity

Fallen back changes made in v4.11.7: Use a simplified version of sample FIFOs in the threaded baseband sample sink

Browse Source
This commit is contained in:
f4exb 2019-09-10 08:41:29 +02:00
parent 410a588fe0
commit 7a1fa085c5
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdrbase/dsp/threadedbasebandsamplesink.cpp
View File

@ -8,8 +8,7 @@
ThreadedBasebandSampleSinkFifo::ThreadedBasebandSampleSinkFifo(BasebandSampleSink *sampleSink, std::size_t size) : ThreadedBasebandSampleSinkFifo::ThreadedBasebandSampleSinkFifo(BasebandSampleSink *sampleSink, std::size_t size) :
m_sampleSink(sampleSink) m_sampleSink(sampleSink)
{ {
//connect(&m_sampleFifo, SIGNAL(dataReady()), this, SLOT(handleFifoData())); connect(&m_sampleFifo, SIGNAL(dataReady()), this, SLOT(handleFifoData()));
connect(&m_sampleVector, SIGNAL(dataReady()), this, SLOT(handleVectorData()));
m_sampleFifo.setSize(size); m_sampleFifo.setSize(size);
} }
@ -20,20 +19,7 @@ ThreadedBasebandSampleSinkFifo::~ThreadedBasebandSampleSinkFifo()
void ThreadedBasebandSampleSinkFifo::writeToFifo(SampleVector::const_iterator& begin, SampleVector::const_iterator& end) void ThreadedBasebandSampleSinkFifo::writeToFifo(SampleVector::const_iterator& begin, SampleVector::const_iterator& end)
{ {
//m_sampleFifo.write(begin, 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);
}
} }
void ThreadedBasebandSampleSinkFifo::handleFifoData() // FIXME: Fixed? Move it to the new threadable sink class void ThreadedBasebandSampleSinkFifo::handleFifoData() // FIXME: Fixed? Move it to the new threadable sink class

3
sdrbase/dsp/threadedbasebandsamplesink.h
View File

@ -23,7 +23,6 @@
#include <QMutex> #include <QMutex>
#include "samplesinkfifo.h" #include "samplesinkfifo.h"
#include "samplesinkvector.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"
#include "export.h" #include "export.h"
@ -44,11 +43,9 @@ public:
BasebandSampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
SampleSinkFifo m_sampleFifo; SampleSinkFifo m_sampleFifo;
SampleSinkVector m_sampleVector;
public slots: public slots:
void handleFifoData(); void handleFifoData();
void handleVectorData();
}; };
/** /**