From a61348948a842a0f29a81f6e34f33084616cb3e9 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 15 Oct 2017 17:37:53 +0200 Subject: [PATCH] LimeSDR and BladeRF output: do not resize sample FIFO to a fixed value in the thread constructor --- plugins/samplesink/bladerfoutput/bladerfoutput.cpp | 1 + plugins/samplesink/bladerfoutput/bladerfoutputthread.cpp | 1 - plugins/samplesink/limesdroutput/limesdroutput.cpp | 1 + plugins/samplesink/limesdroutput/limesdroutputthread.cpp | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp index 4b51497df..56f5ea674 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp @@ -40,6 +40,7 @@ BladerfOutput::BladerfOutput(DeviceSinkAPI *deviceAPI) : m_deviceDescription("BladeRFOutput"), m_running(false) { + m_sampleSourceFifo.resize(16*BLADERFOUTPUT_BLOCKSIZE); openDevice(); m_deviceAPI->setBuddySharedPtr(&m_sharedParams); } diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputthread.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputthread.cpp index ed0f81df5..94eddc475 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputthread.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputthread.cpp @@ -28,7 +28,6 @@ BladerfOutputThread::BladerfOutputThread(struct bladerf* dev, SampleSourceFifo* m_log2Interp(0), m_fcPos(0) { - m_sampleFifo->resize(16*BLADERFOUTPUT_BLOCKSIZE); } BladerfOutputThread::~BladerfOutputThread() diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 94d2a8b7d..c383af2ca 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -43,6 +43,7 @@ LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) : m_running(false), m_channelAcquired(false) { + m_sampleSourceFifo.resize(16*LIMESDROUTPUT_BLOCKSIZE); m_streamId.handle = 0; suspendRxBuddies(); suspendTxBuddies(); diff --git a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp index c79e95554..bd060ac49 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp @@ -27,7 +27,6 @@ LimeSDROutputThread::LimeSDROutputThread(lms_stream_t* stream, SampleSourceFifo* m_log2Interp(0), m_fcPos(LimeSDROutputSettings::FC_POS_CENTER) { - m_sampleFifo->resize(16*LIMESDROUTPUT_BLOCKSIZE); } LimeSDROutputThread::~LimeSDROutputThread()