From 287bf8120d9ff639551b710929d0c72bd4bfaaec Mon Sep 17 00:00:00 2001 From: f4exb <f4exb06@gmail.com> Date: Tue, 8 Aug 2017 13:12:16 +0200 Subject: [PATCH] HackRF output: removed useless method to set samplerate in the thread --- plugins/samplesink/hackrfoutput/hackrfoutput.cpp | 9 ++------- plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp | 6 ------ plugins/samplesink/hackrfoutput/hackrfoutputthread.h | 2 -- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp index eb548218b..078f44975 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp @@ -113,7 +113,6 @@ bool HackRFOutput::start() // mutexLocker.unlock(); applySettings(m_settings, true); - m_hackRFThread->setSamplerate(m_settings.m_devSampleRate); m_hackRFThread->setLog2Interpolation(m_settings.m_log2Interp); m_hackRFThread->startWork(); @@ -244,12 +243,8 @@ bool HackRFOutput::applySettings(const HackRFOutputSettings& settings, bool forc } else { - if (m_hackRFThread != 0) - { - qDebug("HackRFOutput::applySettings: sample rate set to %llu S/s", - settings.m_devSampleRate); - m_hackRFThread->setSamplerate(settings.m_devSampleRate); - } + qDebug("HackRFOutput::applySettings: sample rate set to %llu S/s", + settings.m_devSampleRate); } } } diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp index a6c1fe4f7..66a9eb845 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp @@ -27,7 +27,6 @@ HackRFOutputThread::HackRFOutputThread(hackrf_device* dev, SampleSourceFifo* sam m_running(false), m_dev(dev), m_sampleFifo(sampleFifo), - m_samplerate(10), m_log2Interp(0) { } @@ -53,11 +52,6 @@ void HackRFOutputThread::stopWork() wait(); } -void HackRFOutputThread::setSamplerate(uint32_t samplerate) -{ - m_samplerate = samplerate; -} - void HackRFOutputThread::setLog2Interpolation(unsigned int log2Interp) { m_log2Interp = log2Interp; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputthread.h b/plugins/samplesink/hackrfoutput/hackrfoutputthread.h index 2bcbf63b7..5e51cff2d 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputthread.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputthread.h @@ -36,7 +36,6 @@ public: void startWork(); void stopWork(); - void setSamplerate(uint32_t samplerate); void setLog2Interpolation(unsigned int log2_interp); private: @@ -48,7 +47,6 @@ private: qint8 m_buf[2*HACKRF_BLOCKSIZE]; SampleSourceFifo* m_sampleFifo; - int m_samplerate; unsigned int m_log2Interp; Interpolators<qint8, SDR_SAMP_SZ, 8> m_interpolators;