VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactoring: removed device parameter from all start() methods in sample source plugins

This commit is contained in:
f4exb 2017-04-14 03:40:45 +02:00
parent 1e086fb303
commit b8623c90ce
24 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/airspy/airspyinput.cpp
View File

@ -127,7 +127,7 @@ bool AirspyInput::openDevice()
return true;
}
bool AirspyInput::start(int device)
bool AirspyInput::start()
{
QMutexLocker mutexLocker(&m_mutex);

2
plugins/samplesource/airspy/airspyinput.h
View File

@ -71,7 +71,7 @@ public:
AirspyInput(DeviceSourceAPI *deviceAPI);
virtual ~AirspyInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
plugins/samplesource/bladerfinput/bladerfinput.cpp
View File

@ -113,7 +113,7 @@ bool BladerfInput::openDevice()
return true;
}
bool BladerfInput::start(int device)
bool BladerfInput::start()
{
// QMutexLocker mutexLocker(&m_mutex);

2
plugins/samplesource/bladerfinput/bladerfinput.h
View File

@ -71,7 +71,7 @@ public:
BladerfInput(DeviceSourceAPI *deviceAPI);
virtual ~BladerfInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

17
plugins/samplesource/fcdpro/fcdproinput.cpp
View File

@ -73,7 +73,7 @@ bool FCDProInput::openDevice()
return true;
}
bool FCDProInput::start(int device)
bool FCDProInput::start()
{
qDebug() << "FCDProInput::start";
@ -85,19 +85,6 @@ bool FCDProInput::start(int device)
if (m_running) stop();
// if (m_FCDThread)
// {
// return false;
// }
// m_dev = fcdOpen(fcd_traits<Pro>::vendorId, fcd_traits<Pro>::productId, device);
//
// if (m_dev == 0)
// {
// qCritical("FCDProInput::start: could not open FCD");
// return false;
// }
/* Apply settings before streaming to avoid bus contention;
* there is very little spare bandwidth on a full speed USB device.
* Failure is harmless if no device is found
@ -147,8 +134,6 @@ void FCDProInput::stop()
}
m_running = false;
// fcdClose(m_dev);
// m_dev = 0;
}
const QString& FCDProInput::getDeviceDescription() const

2
plugins/samplesource/fcdpro/fcdproinput.h
View File

@ -58,7 +58,7 @@ public:
FCDProInput(DeviceSourceAPI *deviceAPI);
virtual ~FCDProInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
View File

@ -66,7 +66,7 @@ bool FCDProPlusInput::openDevice()
return true;
}
bool FCDProPlusInput::start(int device)
bool FCDProPlusInput::start()
{
// QMutexLocker mutexLocker(&m_mutex);

2
plugins/samplesource/fcdproplus/fcdproplusinput.h
View File

@ -57,7 +57,7 @@ public:
FCDProPlusInput(DeviceSourceAPI *deviceAPI);
virtual ~FCDProPlusInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
plugins/samplesource/filesource/filesourceinput.cpp
View File

@ -140,7 +140,7 @@ void FileSourceInput::seekFileStream(int seekPercentage)
}
}
bool FileSourceInput::start(int device)
bool FileSourceInput::start()
{
QMutexLocker mutexLocker(&m_mutex);
qDebug() << "FileSourceInput::start";

2
plugins/samplesource/filesource/filesourceinput.h
View File

@ -212,7 +212,7 @@ public:
FileSourceInput(const QTimer& masterTimer);
virtual ~FileSourceInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
plugins/samplesource/hackrfinput/hackrfinput.cpp
View File

@ -99,7 +99,7 @@ bool HackRFInput::openDevice()
return true;
}
bool HackRFInput::start(int device)
bool HackRFInput::start()
{
// QMutexLocker mutexLocker(&m_mutex);
if (!m_dev) {

2
plugins/samplesource/hackrfinput/hackrfinput.h
View File

@ -71,7 +71,7 @@ public:
HackRFInput(DeviceSourceAPI *deviceAPI);
virtual ~HackRFInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
plugins/samplesource/limesdrinput/limesdrinput.cpp
View File

@ -108,7 +108,7 @@ void LimeSDRInput::closeDevice()
m_deviceParams.m_dev = 0;
}
bool LimeSDRInput::start(int device)
bool LimeSDRInput::start()
{
QMutexLocker mutexLocker(&m_mutex);

2
plugins/samplesource/limesdrinput/limesdrinput.h
View File

@ -32,7 +32,7 @@ public:
LimeSDRInput(DeviceSourceAPI *deviceAPI);
virtual ~LimeSDRInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -148,7 +148,7 @@ bool RTLSDRInput::openDevice()
return true;
}
bool RTLSDRInput::start(int device) // TODO: remove device parameter
bool RTLSDRInput::start()
{
QMutexLocker mutexLocker(&m_mutex);

2
plugins/samplesource/rtlsdr/rtlsdrinput.h
View File

@ -87,7 +87,7 @@ public:
RTLSDRInput(DeviceSourceAPI *deviceAPI);
virtual ~RTLSDRInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp
View File

@ -63,7 +63,7 @@ SDRdaemonInput::~SDRdaemonInput()
delete m_SDRdaemonUDPHandler;
}
bool SDRdaemonInput::start(int device)
bool SDRdaemonInput::start()
{
qDebug() << "SDRdaemonInput::start";
MsgConfigureSDRdaemonWork *command = MsgConfigureSDRdaemonWork::create(true);

2
plugins/samplesource/sdrdaemon/sdrdaemoninput.h
View File

@ -277,7 +277,7 @@ public:
SDRdaemonInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
virtual ~SDRdaemonInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
View File

@ -61,7 +61,7 @@ SDRdaemonFECInput::~SDRdaemonFECInput()
delete m_SDRdaemonUDPHandler;
}
bool SDRdaemonFECInput::start(int device)
bool SDRdaemonFECInput::start()
{
qDebug() << "SDRdaemonInput::start";
MsgConfigureSDRdaemonWork *command = MsgConfigureSDRdaemonWork::create(true);

2
plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.h
View File

@ -261,7 +261,7 @@ public:
SDRdaemonFECInput(const QTimer& masterTimer, DeviceSourceAPI *deviceAPI);
virtual ~SDRdaemonFECInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

4
plugins/samplesource/sdrplay/sdrplayinput.cpp
View File

@ -94,7 +94,7 @@ bool SDRPlayInput::openDevice()
return true;
}
bool SDRPlayInput::start(int device)
bool SDRPlayInput::start()
{
// QMutexLocker mutexLocker(&m_mutex);
int res;
@ -213,7 +213,7 @@ bool SDRPlayInput::handleMessage(const Message& message)
{
m_settings = settings;
stop();
start(m_devNumber);
start();
}
// standard changes
else

2
plugins/samplesource/sdrplay/sdrplayinput.h
View File

@ -81,7 +81,7 @@ public:
SDRPlayInput(DeviceSourceAPI *deviceAPI);
virtual ~SDRPlayInput();
virtual bool start(int device);
virtual bool start();
virtual void stop();
virtual const QString& getDeviceDescription() const;

2
sdrbase/dsp/devicesamplesource.h
View File

@ -31,7 +31,7 @@ public:
DeviceSampleSource();
virtual ~DeviceSampleSource();
virtual bool start(int device) = 0;
virtual bool start() = 0;
virtual void stop() = 0;
virtual const QString& getDeviceDescription() const = 0;

2
sdrbase/dsp/dspdevicesourceengine.cpp
View File

@ -449,7 +449,7 @@ DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoRunning()
// Start everything
if(!m_deviceSampleSource->start(m_sampleSourceSequence))
if(!m_deviceSampleSource->start())
{
return gotoError("Could not start sample source");
}