From 414a7ccd87c3d361346389c5bac3940def674b18 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 14 Apr 2017 03:44:49 +0200 Subject: [PATCH] Refactoring: removed device parameter from all start() methods in sample sink plugins --- plugins/samplesink/bladerfoutput/bladerfoutput.cpp | 2 +- plugins/samplesink/bladerfoutput/bladerfoutput.h | 2 +- plugins/samplesink/filesink/filesinkoutput.cpp | 2 +- plugins/samplesink/filesink/filesinkoutput.h | 2 +- plugins/samplesink/hackrfoutput/hackrfoutput.cpp | 2 +- plugins/samplesink/hackrfoutput/hackrfoutput.h | 2 +- sdrbase/dsp/devicesamplesink.h | 2 +- sdrbase/dsp/dspdevicesinkengine.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp index b009e398f..3fe3fb421 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp @@ -108,7 +108,7 @@ bool BladerfOutput::openDevice() return true; } -bool BladerfOutput::start(int device) +bool BladerfOutput::start() { // QMutexLocker mutexLocker(&m_mutex); diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.h b/plugins/samplesink/bladerfoutput/bladerfoutput.h index 7f6281d35..82473532d 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.h +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.h @@ -71,7 +71,7 @@ public: BladerfOutput(DeviceSinkAPI *deviceAPI); virtual ~BladerfOutput(); - virtual bool start(int device); + virtual bool start(); virtual void stop(); virtual const QString& getDeviceDescription() const; diff --git a/plugins/samplesink/filesink/filesinkoutput.cpp b/plugins/samplesink/filesink/filesinkoutput.cpp index 9aa534064..830a9efd1 100644 --- a/plugins/samplesink/filesink/filesinkoutput.cpp +++ b/plugins/samplesink/filesink/filesinkoutput.cpp @@ -70,7 +70,7 @@ void FileSinkOutput::openFileStream() qDebug() << "FileSinkOutput::openFileStream: " << m_fileName.toStdString().c_str(); } -bool FileSinkOutput::start(int device) +bool FileSinkOutput::start() { QMutexLocker mutexLocker(&m_mutex); qDebug() << "FileSinkOutput::start"; diff --git a/plugins/samplesink/filesink/filesinkoutput.h b/plugins/samplesink/filesink/filesinkoutput.h index bae882126..a4d911a16 100644 --- a/plugins/samplesink/filesink/filesinkoutput.h +++ b/plugins/samplesink/filesink/filesinkoutput.h @@ -151,7 +151,7 @@ public: FileSinkOutput(DeviceSinkAPI *deviceAPI, const QTimer& masterTimer); virtual ~FileSinkOutput(); - virtual bool start(int device); + virtual bool start(); virtual void stop(); virtual const QString& getDeviceDescription() const; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp index 4fa02e342..622fbd2ac 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp @@ -95,7 +95,7 @@ bool HackRFOutput::openDevice() return true; } -bool HackRFOutput::start(int device) +bool HackRFOutput::start() { if (!m_dev) { return false; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.h b/plugins/samplesink/hackrfoutput/hackrfoutput.h index bf1d71bdd..8f7d5f20a 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.h @@ -71,7 +71,7 @@ public: HackRFOutput(DeviceSinkAPI *deviceAPI); virtual ~HackRFOutput(); - virtual bool start(int device); + virtual bool start(); virtual void stop(); virtual const QString& getDeviceDescription() const; diff --git a/sdrbase/dsp/devicesamplesink.h b/sdrbase/dsp/devicesamplesink.h index 5e6ddeae1..3a381faec 100644 --- a/sdrbase/dsp/devicesamplesink.h +++ b/sdrbase/dsp/devicesamplesink.h @@ -31,7 +31,7 @@ public: DeviceSampleSink(); virtual ~DeviceSampleSink(); - virtual bool start(int device) = 0; + virtual bool start() = 0; virtual void stop() = 0; virtual const QString& getDeviceDescription() const = 0; diff --git a/sdrbase/dsp/dspdevicesinkengine.cpp b/sdrbase/dsp/dspdevicesinkengine.cpp index 23d26697b..dd65a9955 100644 --- a/sdrbase/dsp/dspdevicesinkengine.cpp +++ b/sdrbase/dsp/dspdevicesinkengine.cpp @@ -449,7 +449,7 @@ DSPDeviceSinkEngine::State DSPDeviceSinkEngine::gotoRunning() // Start everything - if(!m_deviceSampleSink->start(m_sampleSinkSequence)) + if(!m_deviceSampleSink->start()) { return gotoError("DSPDeviceSinkEngine::gotoRunning: Could not start sample source"); }