From 0d4426b8f4d3fecc51692101d009557c2f55927f Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 12 Nov 2016 22:57:25 +0100 Subject: [PATCH] BladeRF plugin: cleanup of useless methods and attributes --- plugins/samplesource/bladerf/bladerfinput.cpp | 1 - plugins/samplesource/bladerf/bladerfthread.cpp | 8 +------- plugins/samplesource/bladerf/bladerfthread.h | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/plugins/samplesource/bladerf/bladerfinput.cpp b/plugins/samplesource/bladerf/bladerfinput.cpp index edaff967c..54cfece03 100644 --- a/plugins/samplesource/bladerf/bladerfinput.cpp +++ b/plugins/samplesource/bladerf/bladerfinput.cpp @@ -325,7 +325,6 @@ bool BladerfInput::applySettings(const BladeRFSettings& settings, bool force) else { qDebug() << "bladerf_set_sample_rate(BLADERF_MODULE_RX) actual sample rate is " << actualSamplerate; - m_bladerfThread->setSamplerate(m_settings.m_devSampleRate); } } } diff --git a/plugins/samplesource/bladerf/bladerfthread.cpp b/plugins/samplesource/bladerf/bladerfthread.cpp index 3d7074307..b9b99daa1 100644 --- a/plugins/samplesource/bladerf/bladerfthread.cpp +++ b/plugins/samplesource/bladerf/bladerfthread.cpp @@ -17,7 +17,7 @@ #include #include #include "bladerfthread.h" -#include "../../../sdrbase/dsp/samplesinkfifo.h" +#include "dsp/samplesinkfifo.h" @@ -27,7 +27,6 @@ BladerfThread::BladerfThread(struct bladerf* dev, SampleSinkFifo* sampleFifo, QO m_dev(dev), m_convertBuffer(BLADERF_BLOCKSIZE), m_sampleFifo(sampleFifo), - m_samplerate(10), m_log2Decim(0), m_fcPos(0) { @@ -53,11 +52,6 @@ void BladerfThread::stopWork() wait(); } -void BladerfThread::setSamplerate(int samplerate) -{ - m_samplerate = samplerate; -} - void BladerfThread::setLog2Decimation(unsigned int log2_decim) { m_log2Decim = log2_decim; diff --git a/plugins/samplesource/bladerf/bladerfthread.h b/plugins/samplesource/bladerf/bladerfthread.h index 6abf3ee60..da4fd91cf 100644 --- a/plugins/samplesource/bladerf/bladerfthread.h +++ b/plugins/samplesource/bladerf/bladerfthread.h @@ -22,7 +22,6 @@ #include #include #include "dsp/samplesinkfifo.h" -//#include "dsp/inthalfbandfilter.h" #include "dsp/decimators.h" #define BLADERF_BLOCKSIZE (1<<14) @@ -36,7 +35,6 @@ public: void startWork(); void stopWork(); - void setSamplerate(int samplerate); void setLog2Decimation(unsigned int log2_decim); void setFcPos(int fcPos); @@ -50,7 +48,6 @@ private: SampleVector m_convertBuffer; SampleSinkFifo* m_sampleFifo; - int m_samplerate; unsigned int m_log2Decim; int m_fcPos;