VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-26 05:55:35 -04:00
Code Issues Projects Releases Wiki Activity

RxTx semantic move: renamed DSPDeviceEngine to DSPDeviceSourceEngine

Browse Source
This commit is contained in:
f4exb 2016-10-03 18:29:05 +02:00
parent dce0ace4ef
commit e204efe2b8
28 changed files with 545 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -100,7 +100,7 @@ set(sdrbase_SOURCES
sdrbase/dsp/ctcssdetector.cpp sdrbase/dsp/ctcssdetector.cpp
sdrbase/dsp/dspcommands.cpp sdrbase/dsp/dspcommands.cpp
sdrbase/dsp/dspengine.cpp sdrbase/dsp/dspengine.cpp
sdrbase/dsp/dspdeviceengine.cpp sdrbase/dsp/dspdevicesourceengine.cpp
sdrbase/dsp/fftengine.cpp sdrbase/dsp/fftengine.cpp
sdrbase/dsp/fftfilt.cxx sdrbase/dsp/fftfilt.cxx
sdrbase/dsp/fftwindow.cpp sdrbase/dsp/fftwindow.cpp
@ -183,7 +183,7 @@ set(sdrbase_HEADERS
sdrbase/dsp/decimators.h sdrbase/dsp/decimators.h
sdrbase/dsp/dspcommands.h sdrbase/dsp/dspcommands.h
sdrbase/dsp/dspengine.h sdrbase/dsp/dspengine.h
sdrbase/dsp/dspdeviceengine.h sdrbase/dsp/dspdevicesourceengine.h
sdrbase/dsp/dsptypes.h sdrbase/dsp/dsptypes.h
sdrbase/dsp/fftengine.h sdrbase/dsp/fftengine.h
sdrbase/dsp/fftfilt.h sdrbase/dsp/fftfilt.h

10
plugins/samplesource/airspy/airspygui.cpp
View File

@ -36,7 +36,7 @@ AirspyGui::AirspyGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_settings(), m_settings(),
m_sampleSource(0), m_sampleSource(0),
m_lastEngineState((DSPDeviceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
@ -391,16 +391,16 @@ void AirspyGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

10
plugins/samplesource/bladerf/bladerfgui.cpp
View File

@ -35,7 +35,7 @@ BladerfGui::BladerfGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_settings(), m_settings(),
m_sampleSource(NULL), m_sampleSource(NULL),
m_sampleRate(0), m_sampleRate(0),
m_lastEngineState((DSPDeviceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
@ -397,16 +397,16 @@ void BladerfGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

10
plugins/samplesource/fcdpro/fcdprogui.cpp
View File

@ -33,7 +33,7 @@ FCDProGui::FCDProGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_settings(), m_settings(),
m_sampleSource(NULL), m_sampleSource(NULL),
m_lastEngineState((DSPDeviceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
@ -460,16 +460,16 @@ void FCDProGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

10
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
View File

@ -34,7 +34,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_settings(), m_settings(),
m_sampleSource(NULL), m_sampleSource(NULL),
m_lastEngineState((DSPDeviceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -220,16 +220,16 @@ void FCDProPlusGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

10
plugins/samplesource/filesource/filesourcegui.cpp
View File

@ -49,7 +49,7 @@ FileSourceGui::FileSourceGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_samplesCount(0), m_samplesCount(0),
m_tickCount(0), m_tickCount(0),
m_enableNavTime(false), m_enableNavTime(false),
m_lastEngineState((DSPDeviceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
@ -239,16 +239,16 @@ void FileSourceGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

10
plugins/samplesource/hackrf/hackrfgui.cpp
View File

@ -36,7 +36,7 @@ HackRFGui::HackRFGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_settings(), m_settings(),
m_sampleSource(NULL), m_sampleSource(NULL),
m_lastEngineState((DSPDeviceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
@ -374,16 +374,16 @@ void HackRFGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

10
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
View File

@ -34,7 +34,7 @@ RTLSDRGui::RTLSDRGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_settings(), m_settings(),
m_sampleSource(0), m_sampleSource(0),
m_lastEngineState((DSPDeviceEngine::State)-1) m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
@ -357,16 +357,16 @@ void RTLSDRGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

10
plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
View File

@ -47,7 +47,7 @@ SDRdaemonGui::SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_sampleSource(NULL), m_sampleSource(NULL),
m_acquisition(false), m_acquisition(false),
m_lastEngineState((DSPDeviceEngine::State)-1), m_lastEngineState((DSPDeviceSourceEngine::State)-1),
m_sampleRate(0), m_sampleRate(0),
m_sampleRateStream(0), m_sampleRateStream(0),
m_centerFrequency(0), m_centerFrequency(0),
@ -705,16 +705,16 @@ void SDRdaemonGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

10
plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp
View File

@ -47,7 +47,7 @@ SDRdaemonFECGui::SDRdaemonFECGui(DeviceAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_sampleSource(NULL), m_sampleSource(NULL),
m_acquisition(false), m_acquisition(false),
m_lastEngineState((DSPDeviceEngine::State)-1), m_lastEngineState((DSPDeviceSourceEngine::State)-1),
m_sampleRate(0), m_sampleRate(0),
m_centerFrequency(0), m_centerFrequency(0),
m_framesDecodingStatus(0), m_framesDecodingStatus(0),
@ -659,16 +659,16 @@ void SDRdaemonFECGui::updateStatus()
{ {
switch(state) switch(state)
{ {
case DSPDeviceEngine::StNotStarted: case DSPDeviceSourceEngine::StNotStarted:
ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->startStop->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
break; break;
case DSPDeviceEngine::StIdle: case DSPDeviceSourceEngine::StIdle:
ui->startStop->setStyleSheet("QToolButton { background-color : blue; }"); ui->startStop->setStyleSheet("QToolButton { background-color : blue; }");
break; break;
case DSPDeviceEngine::StRunning: case DSPDeviceSourceEngine::StRunning:
ui->startStop->setStyleSheet("QToolButton { background-color : green; }"); ui->startStop->setStyleSheet("QToolButton { background-color : green; }");
break; break;
case DSPDeviceEngine::StError: case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage()); QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
break; break;

4
sdrbase/device/deviceapi.cpp
View File

@ -25,7 +25,7 @@
DeviceAPI::DeviceAPI(MainWindow *mainWindow, DeviceAPI::DeviceAPI(MainWindow *mainWindow,
int deviceTabIndex, int deviceTabIndex,
DSPDeviceEngine *deviceEngine, DSPDeviceSourceEngine *deviceEngine,
GLSpectrum *glSpectrum, GLSpectrum *glSpectrum,
ChannelWindow *channelWindow) : ChannelWindow *channelWindow) :
m_mainWindow(mainWindow), m_mainWindow(mainWindow),
@ -82,7 +82,7 @@ void DeviceAPI::stopAcquisition()
m_deviceEngine->stopAcquistion(); m_deviceEngine->stopAcquistion();
} }
DSPDeviceEngine::State DeviceAPI::state() const DSPDeviceSourceEngine::State DeviceAPI::state() const
{ {
return m_deviceEngine->state(); return m_deviceEngine->state();
} }

10
sdrbase/device/deviceapi.h
View File

@ -20,12 +20,12 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include "../dsp/dspdevicesourceengine.h"
#include "util/export.h" #include "util/export.h"
#include "dsp/dspdeviceengine.h"
class MainWindow; class MainWindow;
class DSPDeviceEngine; class DSPDeviceSourceEngine;
class GLSpectrum; class GLSpectrum;
class ChannelWindow; class ChannelWindow;
class BasebandSampleSink; class BasebandSampleSink;
@ -51,7 +51,7 @@ public:
bool initAcquisition(); //!< Initialize device engine acquisition sequence bool initAcquisition(); //!< Initialize device engine acquisition sequence
bool startAcquisition(); //!< Start device engine acquisition sequence bool startAcquisition(); //!< Start device engine acquisition sequence
void stopAcquisition(); //!< Stop device engine acquisition sequence void stopAcquisition(); //!< Stop device engine acquisition sequence
DSPDeviceEngine::State state() const; //!< device engine state DSPDeviceSourceEngine::State state() const; //!< device engine state
QString errorMessage(); //!< Return the current device engine error message QString errorMessage(); //!< Return the current device engine error message
uint getDeviceUID() const; //!< Return the current device engine unique ID uint getDeviceUID() const; //!< Return the current device engine unique ID
MessageQueue *getDeviceInputMessageQueue(); MessageQueue *getDeviceInputMessageQueue();
@ -105,7 +105,7 @@ protected:
DeviceAPI(MainWindow *mainWindow, DeviceAPI(MainWindow *mainWindow,
int deviceTabIndex, int deviceTabIndex,
DSPDeviceEngine *deviceEngine, DSPDeviceSourceEngine *deviceEngine,
GLSpectrum *glSpectrum, GLSpectrum *glSpectrum,
ChannelWindow *channelWindow); ChannelWindow *channelWindow);
~DeviceAPI(); ~DeviceAPI();
@ -114,7 +114,7 @@ protected:
MainWindow *m_mainWindow; MainWindow *m_mainWindow;
int m_deviceTabIndex; int m_deviceTabIndex;
DSPDeviceEngine *m_deviceEngine; DSPDeviceSourceEngine *m_deviceEngine;
GLSpectrum *m_spectrum; GLSpectrum *m_spectrum;
ChannelWindow *m_channelWindow; ChannelWindow *m_channelWindow;

59
sdrbase/dsp/dspdeviceengine.cpp → sdrbase/dsp/dspdevicesourceengine.cpp
View File

@ -15,17 +15,18 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include "dspdevicesourceengine.h"
#include <dsp/basebandsamplesink.h> #include <dsp/basebandsamplesink.h>
#include <dsp/devicesamplesource.h> #include <dsp/devicesamplesource.h>
#include <dsp/downchannelizer.h> #include <dsp/downchannelizer.h>
#include <stdio.h> #include <stdio.h>
#include <QDebug> #include <QDebug>
#include "dsp/dspdeviceengine.h"
#include "dsp/samplefifo.h" #include "dsp/samplefifo.h"
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "threadedbasebandsamplesink.h" #include "threadedbasebandsamplesink.h"
DSPDeviceEngine::DSPDeviceEngine(uint uid, QObject* parent) : DSPDeviceSourceEngine::DSPDeviceSourceEngine(uint uid, QObject* parent) :
m_uid(uid), m_uid(uid),
QThread(parent), QThread(parent),
m_state(StNotStarted), m_state(StNotStarted),
@ -48,12 +49,12 @@ DSPDeviceEngine::DSPDeviceEngine(uint uid, QObject* parent) :
moveToThread(this); moveToThread(this);
} }
DSPDeviceEngine::~DSPDeviceEngine() DSPDeviceSourceEngine::~DSPDeviceSourceEngine()
{ {
wait(); wait();
} }
void DSPDeviceEngine::run() void DSPDeviceSourceEngine::run()
{ {
qDebug() << "DSPDeviceEngine::run"; qDebug() << "DSPDeviceEngine::run";
@ -63,20 +64,20 @@ void DSPDeviceEngine::run()
exec(); exec();
} }
void DSPDeviceEngine::start() void DSPDeviceSourceEngine::start()
{ {
qDebug() << "DSPDeviceEngine::start"; qDebug() << "DSPDeviceEngine::start";
QThread::start(); QThread::start();
} }
void DSPDeviceEngine::stop() void DSPDeviceSourceEngine::stop()
{ {
qDebug() << "DSPDeviceEngine::stop"; qDebug() << "DSPDeviceEngine::stop";
DSPExit cmd; DSPExit cmd;
m_syncMessenger.sendWait(cmd); m_syncMessenger.sendWait(cmd);
} }
bool DSPDeviceEngine::initAcquisition() bool DSPDeviceSourceEngine::initAcquisition()
{ {
qDebug() << "DSPDeviceEngine::initAcquisition"; qDebug() << "DSPDeviceEngine::initAcquisition";
DSPAcquisitionInit cmd; DSPAcquisitionInit cmd;
@ -84,7 +85,7 @@ bool DSPDeviceEngine::initAcquisition()
return m_syncMessenger.sendWait(cmd) == StReady; return m_syncMessenger.sendWait(cmd) == StReady;
} }
bool DSPDeviceEngine::startAcquisition() bool DSPDeviceSourceEngine::startAcquisition()
{ {
qDebug() << "DSPDeviceEngine::startAcquisition"; qDebug() << "DSPDeviceEngine::startAcquisition";
DSPAcquisitionStart cmd; DSPAcquisitionStart cmd;
@ -92,7 +93,7 @@ bool DSPDeviceEngine::startAcquisition()
return m_syncMessenger.sendWait(cmd) == StRunning; return m_syncMessenger.sendWait(cmd) == StRunning;
} }
void DSPDeviceEngine::stopAcquistion() void DSPDeviceSourceEngine::stopAcquistion()
{ {
qDebug() << "DSPDeviceEngine::stopAcquistion"; qDebug() << "DSPDeviceEngine::stopAcquistion";
DSPAcquisitionStop cmd; DSPAcquisitionStop cmd;
@ -105,55 +106,55 @@ void DSPDeviceEngine::stopAcquistion()
} }
} }
void DSPDeviceEngine::setSource(DeviceSampleSource* source) void DSPDeviceSourceEngine::setSource(DeviceSampleSource* source)
{ {
qDebug() << "DSPDeviceEngine::setSource"; qDebug() << "DSPDeviceEngine::setSource";
DSPSetSource cmd(source); DSPSetSource cmd(source);
m_syncMessenger.sendWait(cmd); m_syncMessenger.sendWait(cmd);
} }
void DSPDeviceEngine::setSourceSequence(int sequence) void DSPDeviceSourceEngine::setSourceSequence(int sequence)
{ {
qDebug("DSPDeviceEngine::setSourceSequence: seq: %d", sequence); qDebug("DSPDeviceEngine::setSourceSequence: seq: %d", sequence);
m_sampleSourceSequence = sequence; m_sampleSourceSequence = sequence;
} }
void DSPDeviceEngine::addSink(BasebandSampleSink* sink) void DSPDeviceSourceEngine::addSink(BasebandSampleSink* sink)
{ {
qDebug() << "DSPDeviceEngine::addSink: " << sink->objectName().toStdString().c_str(); qDebug() << "DSPDeviceEngine::addSink: " << sink->objectName().toStdString().c_str();
DSPAddSink cmd(sink); DSPAddSink cmd(sink);
m_syncMessenger.sendWait(cmd); m_syncMessenger.sendWait(cmd);
} }
void DSPDeviceEngine::removeSink(BasebandSampleSink* sink) void DSPDeviceSourceEngine::removeSink(BasebandSampleSink* sink)
{ {
qDebug() << "DSPDeviceEngine::removeSink: " << sink->objectName().toStdString().c_str(); qDebug() << "DSPDeviceEngine::removeSink: " << sink->objectName().toStdString().c_str();
DSPRemoveSink cmd(sink); DSPRemoveSink cmd(sink);
m_syncMessenger.sendWait(cmd); m_syncMessenger.sendWait(cmd);
} }
void DSPDeviceEngine::addThreadedSink(ThreadedBasebandSampleSink* sink) void DSPDeviceSourceEngine::addThreadedSink(ThreadedBasebandSampleSink* sink)
{ {
qDebug() << "DSPDeviceEngine::addThreadedSink: " << sink->objectName().toStdString().c_str(); qDebug() << "DSPDeviceEngine::addThreadedSink: " << sink->objectName().toStdString().c_str();
DSPAddThreadedSampleSink cmd(sink); DSPAddThreadedSampleSink cmd(sink);
m_syncMessenger.sendWait(cmd); m_syncMessenger.sendWait(cmd);
} }
void DSPDeviceEngine::removeThreadedSink(ThreadedBasebandSampleSink* sink) void DSPDeviceSourceEngine::removeThreadedSink(ThreadedBasebandSampleSink* sink)
{ {
qDebug() << "DSPDeviceEngine::removeThreadedSink: " << sink->objectName().toStdString().c_str(); qDebug() << "DSPDeviceEngine::removeThreadedSink: " << sink->objectName().toStdString().c_str();
DSPRemoveThreadedSampleSink cmd(sink); DSPRemoveThreadedSampleSink cmd(sink);
m_syncMessenger.sendWait(cmd); m_syncMessenger.sendWait(cmd);
} }
void DSPDeviceEngine::configureCorrections(bool dcOffsetCorrection, bool iqImbalanceCorrection) void DSPDeviceSourceEngine::configureCorrections(bool dcOffsetCorrection, bool iqImbalanceCorrection)
{ {
qDebug() << "DSPDeviceEngine::configureCorrections"; qDebug() << "DSPDeviceEngine::configureCorrections";
DSPConfigureCorrection* cmd = new DSPConfigureCorrection(dcOffsetCorrection, iqImbalanceCorrection); DSPConfigureCorrection* cmd = new DSPConfigureCorrection(dcOffsetCorrection, iqImbalanceCorrection);
m_inputMessageQueue.push(cmd); m_inputMessageQueue.push(cmd);
} }
QString DSPDeviceEngine::errorMessage() QString DSPDeviceSourceEngine::errorMessage()
{ {
qDebug() << "DSPDeviceEngine::errorMessage"; qDebug() << "DSPDeviceEngine::errorMessage";
DSPGetErrorMessage cmd; DSPGetErrorMessage cmd;
@ -161,7 +162,7 @@ QString DSPDeviceEngine::errorMessage()
return cmd.getErrorMessage(); return cmd.getErrorMessage();
} }
QString DSPDeviceEngine::sourceDeviceDescription() QString DSPDeviceSourceEngine::sourceDeviceDescription()
{ {
qDebug() << "DSPDeviceEngine::sourceDeviceDescription"; qDebug() << "DSPDeviceEngine::sourceDeviceDescription";
DSPGetSourceDeviceDescription cmd; DSPGetSourceDeviceDescription cmd;
@ -169,7 +170,7 @@ QString DSPDeviceEngine::sourceDeviceDescription()
return cmd.getDeviceDescription(); return cmd.getDeviceDescription();
} }
void DSPDeviceEngine::dcOffset(SampleVector::iterator begin, SampleVector::iterator end) void DSPDeviceSourceEngine::dcOffset(SampleVector::iterator begin, SampleVector::iterator end)
{ {
double count; double count;
int io = 0; int io = 0;
@ -190,7 +191,7 @@ void DSPDeviceEngine::dcOffset(SampleVector::iterator begin, SampleVector::itera
m_qOffset = (15.0 * m_qOffset + (double)qo / count) / 16.0; m_qOffset = (15.0 * m_qOffset + (double)qo / count) / 16.0;
} }
void DSPDeviceEngine::imbalance(SampleVector::iterator begin, SampleVector::iterator end) void DSPDeviceSourceEngine::imbalance(SampleVector::iterator begin, SampleVector::iterator end)
{ {
int iMin = 0; int iMin = 0;
int iMax = 0; int iMax = 0;
@ -239,7 +240,7 @@ void DSPDeviceEngine::imbalance(SampleVector::iterator begin, SampleVector::iter
} }
} }
void DSPDeviceEngine::work() void DSPDeviceSourceEngine::work()
{ {
SampleFifo* sampleFifo = m_sampleSource->getSampleFifo(); SampleFifo* sampleFifo = m_sampleSource->getSampleFifo();
std::size_t samplesDone = 0; std::size_t samplesDone = 0;
@ -318,7 +319,7 @@ void DSPDeviceEngine::work()
// ^ | // ^ |
// +-----------------------+ // +-----------------------+
DSPDeviceEngine::State DSPDeviceEngine::gotoIdle() DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoIdle()
{ {
qDebug() << "DSPDeviceEngine::gotoIdle"; qDebug() << "DSPDeviceEngine::gotoIdle";
@ -354,7 +355,7 @@ DSPDeviceEngine::State DSPDeviceEngine::gotoIdle()
return StIdle; return StIdle;
} }
DSPDeviceEngine::State DSPDeviceEngine::gotoInit() DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoInit()
{ {
qDebug() << "DSPDeviceEngine::gotoInit"; qDebug() << "DSPDeviceEngine::gotoInit";
@ -415,7 +416,7 @@ DSPDeviceEngine::State DSPDeviceEngine::gotoInit()
return StReady; return StReady;
} }
DSPDeviceEngine::State DSPDeviceEngine::gotoRunning() DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoRunning()
{ {
qDebug() << "DSPDeviceEngine::gotoRunning"; qDebug() << "DSPDeviceEngine::gotoRunning";
@ -465,7 +466,7 @@ DSPDeviceEngine::State DSPDeviceEngine::gotoRunning()
return StRunning; return StRunning;
} }
DSPDeviceEngine::State DSPDeviceEngine::gotoError(const QString& errorMessage) DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoError(const QString& errorMessage)
{ {
qDebug() << "DSPDeviceEngine::gotoError"; qDebug() << "DSPDeviceEngine::gotoError";
@ -475,7 +476,7 @@ DSPDeviceEngine::State DSPDeviceEngine::gotoError(const QString& errorMessage)
return StError; return StError;
} }
void DSPDeviceEngine::handleSetSource(DeviceSampleSource* source) void DSPDeviceSourceEngine::handleSetSource(DeviceSampleSource* source)
{ {
gotoIdle(); gotoIdle();
@ -497,7 +498,7 @@ void DSPDeviceEngine::handleSetSource(DeviceSampleSource* source)
} }
} }
void DSPDeviceEngine::handleData() void DSPDeviceSourceEngine::handleData()
{ {
if(m_state == StRunning) if(m_state == StRunning)
{ {
@ -505,7 +506,7 @@ void DSPDeviceEngine::handleData()
} }
} }
void DSPDeviceEngine::handleSynchronousMessages() void DSPDeviceSourceEngine::handleSynchronousMessages()
{ {
Message *message = m_syncMessenger.getMessage(); Message *message = m_syncMessenger.getMessage();
qDebug() << "DSPDeviceEngine::handleSynchronousMessages: " << message->getIdentifier(); qDebug() << "DSPDeviceEngine::handleSynchronousMessages: " << message->getIdentifier();
@ -576,7 +577,7 @@ void DSPDeviceEngine::handleSynchronousMessages()
m_syncMessenger.done(m_state); m_syncMessenger.done(m_state);
} }
void DSPDeviceEngine::handleInputMessages() void DSPDeviceSourceEngine::handleInputMessages()
{ {
qDebug() << "DSPDeviceEngine::handleInputMessages"; qDebug() << "DSPDeviceEngine::handleInputMessages";

6
sdrbase/dsp/dspdeviceengine.h → sdrbase/dsp/dspdevicesourceengine.h
View File

@ -33,7 +33,7 @@ class DeviceSampleSource;
class BasebandSampleSink; class BasebandSampleSink;
class ThreadedBasebandSampleSink; class ThreadedBasebandSampleSink;
class SDRANGEL_API DSPDeviceEngine : public QThread { class SDRANGEL_API DSPDeviceSourceEngine : public QThread {
Q_OBJECT Q_OBJECT
public: public:
@ -45,8 +45,8 @@ public:
StError //!< engine is in error StError //!< engine is in error
}; };
DSPDeviceEngine(uint uid, QObject* parent = NULL); DSPDeviceSourceEngine(uint uid, QObject* parent = NULL);
~DSPDeviceEngine(); ~DSPDeviceSourceEngine();
uint getUID() const { return m_uid; } uint getUID() const { return m_uid; }

16
sdrbase/dsp/dspengine.cpp
View File

@ -28,7 +28,7 @@ DSPEngine::DSPEngine() :
DSPEngine::~DSPEngine() DSPEngine::~DSPEngine()
{ {
std::vector<DSPDeviceEngine*>::iterator it = m_deviceEngines.begin(); std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
while (it != m_deviceEngines.end()) while (it != m_deviceEngines.end())
{ {
@ -43,9 +43,9 @@ DSPEngine *DSPEngine::instance()
return dspEngine; return dspEngine;
} }
DSPDeviceEngine *DSPEngine::addDeviceEngine() DSPDeviceSourceEngine *DSPEngine::addDeviceEngine()
{ {
m_deviceEngines.push_back(new DSPDeviceEngine(m_deviceEnginesUIDSequence)); m_deviceEngines.push_back(new DSPDeviceSourceEngine(m_deviceEnginesUIDSequence));
m_deviceEnginesUIDSequence++; m_deviceEnginesUIDSequence++;
return m_deviceEngines.back(); return m_deviceEngines.back();
} }
@ -54,7 +54,7 @@ void DSPEngine::removeLastDeviceEngine()
{ {
if (m_deviceEngines.size() > 0) if (m_deviceEngines.size() > 0)
{ {
DSPDeviceEngine *lastDeviceEngine = m_deviceEngines.back(); DSPDeviceSourceEngine *lastDeviceEngine = m_deviceEngines.back();
delete lastDeviceEngine; delete lastDeviceEngine;
m_deviceEngines.pop_back(); m_deviceEngines.pop_back();
m_deviceEnginesUIDSequence--; m_deviceEnginesUIDSequence--;
@ -63,7 +63,7 @@ void DSPEngine::removeLastDeviceEngine()
void DSPEngine::stopAllAcquisitions() void DSPEngine::stopAllAcquisitions()
{ {
std::vector<DSPDeviceEngine*>::iterator it = m_deviceEngines.begin(); std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
while (it != m_deviceEngines.end()) while (it != m_deviceEngines.end())
{ {
@ -75,7 +75,7 @@ void DSPEngine::stopAllAcquisitions()
void DSPEngine::stopAllDeviceEngines() void DSPEngine::stopAllDeviceEngines()
{ {
std::vector<DSPDeviceEngine*>::iterator it = m_deviceEngines.begin(); std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
while (it != m_deviceEngines.end()) while (it != m_deviceEngines.end())
{ {
@ -118,9 +118,9 @@ void DSPEngine::removeAudioSink(AudioFifo* audioFifo)
m_audioOutput.removeFifo(audioFifo); m_audioOutput.removeFifo(audioFifo);
} }
DSPDeviceEngine *DSPEngine::getDeviceEngineByUID(uint uid) DSPDeviceSourceEngine *DSPEngine::getDeviceEngineByUID(uint uid)
{ {
std::vector<DSPDeviceEngine*>::iterator it = m_deviceEngines.begin(); std::vector<DSPDeviceSourceEngine*>::iterator it = m_deviceEngines.begin();
while (it != m_deviceEngines.end()) while (it != m_deviceEngines.end())
{ {

12
sdrbase/dsp/dspengine.h
View File

@ -20,14 +20,14 @@
#include <QObject> #include <QObject>
#include <vector> #include <vector>
#include "dsp/dspdeviceengine.h"
#include "audio/audiooutput.h" #include "audio/audiooutput.h"
#include "dspdevicesourceengine.h"
#include "util/export.h" #include "util/export.h"
#ifdef DSD_USE_SERIALDV #ifdef DSD_USE_SERIALDV
#include "dsp/dvserialengine.h" #include "dsp/dvserialengine.h"
#endif #endif
class DSPDeviceEngine; class DSPDeviceSourceEngine;
class ThreadedBasebandSampleSink; class ThreadedBasebandSampleSink;
class SDRANGEL_API DSPEngine : public QObject { class SDRANGEL_API DSPEngine : public QObject {
@ -40,7 +40,7 @@ public:
uint getAudioSampleRate() const { return m_audioSampleRate; } uint getAudioSampleRate() const { return m_audioSampleRate; }
DSPDeviceEngine *addDeviceEngine(); DSPDeviceSourceEngine *addDeviceEngine();
void removeLastDeviceEngine(); void removeLastDeviceEngine();
void stopAllAcquisitions(); void stopAllAcquisitions();
void stopAllDeviceEngines(); void stopAllDeviceEngines();
@ -50,8 +50,8 @@ public:
void startAudioImmediate(); void startAudioImmediate();
void stopAudioImmediate(); void stopAudioImmediate();
DSPDeviceEngine *getDeviceEngineByIndex(uint deviceIndex) { return m_deviceEngines[deviceIndex]; } DSPDeviceSourceEngine *getDeviceEngineByIndex(uint deviceIndex) { return m_deviceEngines[deviceIndex]; }
DSPDeviceEngine *getDeviceEngineByUID(uint uid); DSPDeviceSourceEngine *getDeviceEngineByUID(uint uid);
void addAudioSink(AudioFifo* audioFifo); //!< Add the audio sink void addAudioSink(AudioFifo* audioFifo); //!< Add the audio sink
void removeAudioSink(AudioFifo* audioFifo); //!< Remove the audio sink void removeAudioSink(AudioFifo* audioFifo); //!< Remove the audio sink
@ -84,7 +84,7 @@ public:
} }
private: private:
std::vector<DSPDeviceEngine*> m_deviceEngines; std::vector<DSPDeviceSourceEngine*> m_deviceEngines;
uint m_deviceEnginesUIDSequence; uint m_deviceEnginesUIDSequence;
AudioOutput m_audioOutput; AudioOutput m_audioOutput;
uint m_audioSampleRate; uint m_audioSampleRate;

6
sdrbase/mainwindow.cpp
View File

@ -60,7 +60,7 @@ MainWindow::MainWindow(QWidget* parent) :
m_masterTabIndex(0), m_masterTabIndex(0),
m_settings(), m_settings(),
m_dspEngine(DSPEngine::instance()), m_dspEngine(DSPEngine::instance()),
m_lastEngineState((DSPDeviceEngine::State)-1), m_lastEngineState((DSPDeviceSourceEngine::State)-1),
m_inputGUI(0), m_inputGUI(0),
m_sampleRate(0), m_sampleRate(0),
m_centerFrequency(0), m_centerFrequency(0),
@ -172,7 +172,7 @@ MainWindow::~MainWindow()
void MainWindow::addDevice() void MainWindow::addDevice()
{ {
DSPDeviceEngine *dspDeviceEngine = m_dspEngine->addDeviceEngine(); DSPDeviceSourceEngine *dspDeviceEngine = m_dspEngine->addDeviceEngine();
dspDeviceEngine->start(); dspDeviceEngine->start();
uint dspDeviceEngineUID = dspDeviceEngine->getUID(); uint dspDeviceEngineUID = dspDeviceEngine->getUID();
@ -208,7 +208,7 @@ void MainWindow::addDevice()
void MainWindow::removeLastDevice() void MainWindow::removeLastDevice()
{ {
DSPDeviceEngine *lastDeviceEngine = m_deviceUIs.back()->m_deviceEngine; DSPDeviceSourceEngine *lastDeviceEngine = m_deviceUIs.back()->m_deviceEngine;
lastDeviceEngine->stopAcquistion(); lastDeviceEngine->stopAcquistion();
lastDeviceEngine->removeSink(m_deviceUIs.back()->m_spectrumVis); lastDeviceEngine->removeSink(m_deviceUIs.back()->m_spectrumVis);

4
sdrbase/mainwindow.h
View File

@ -33,7 +33,7 @@ class SamplingDeviceControl;
class AudioDeviceInfo; class AudioDeviceInfo;
class DSPEngine; class DSPEngine;
class DSPDeviceEngine; class DSPDeviceSourceEngine;
class Indicator; class Indicator;
class SpectrumVis; class SpectrumVis;
class GLSpectrum; class GLSpectrum;
@ -63,7 +63,7 @@ public:
GLSpectrumGUI *m_spectrumGUI; GLSpectrumGUI *m_spectrumGUI;
ChannelWindow *m_channelWindow; ChannelWindow *m_channelWindow;
SamplingDeviceControl *m_samplingDeviceControl; SamplingDeviceControl *m_samplingDeviceControl;
DSPDeviceEngine *m_deviceEngine; DSPDeviceSourceEngine *m_deviceEngine;
DeviceAPI *m_deviceAPI; DeviceAPI *m_deviceAPI;
QByteArray m_mainWindowState; QByteArray m_mainWindowState;

2
sdrbase/plugin/pluginmanager.cpp
View File

@ -9,10 +9,10 @@
#include "settings/preset.h" #include "settings/preset.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "gui/glspectrum.h" #include "gui/glspectrum.h"
#include "dsp/dspdeviceengine.h"
#include "util/message.h" #include "util/message.h"
#include <QDebug> #include <QDebug>
#include "../dsp/dspdevicesourceengine.h"
const QString PluginManager::m_sdrDaemonDeviceTypeID = "sdrangel.samplesource.sdrdaemon"; const QString PluginManager::m_sdrDaemonDeviceTypeID = "sdrangel.samplesource.sdrdaemon";
const QString PluginManager::m_sdrDaemonFECDeviceTypeID = "sdrangel.samplesource.sdrdaemonfec"; const QString PluginManager::m_sdrDaemonFECDeviceTypeID = "sdrangel.samplesource.sdrdaemonfec";

2
sdrbase/plugin/pluginmanager.h
View File

@ -13,7 +13,7 @@ class Preset;
class MainWindow; class MainWindow;
class Message; class Message;
class MessageQueue; class MessageQueue;
class DSPDeviceEngine; class DSPDeviceSourceEngine;
class DeviceAPI; class DeviceAPI;
class SDRANGEL_API PluginManager : public QObject { class SDRANGEL_API PluginManager : public QObject {

4
sdrbase/sdrbase.pro
View File

@ -38,7 +38,7 @@ SOURCES += mainwindow.cpp\
dsp/ctcssdetector.cpp\ dsp/ctcssdetector.cpp\
dsp/dspcommands.cpp\ dsp/dspcommands.cpp\
dsp/dspengine.cpp\ dsp/dspengine.cpp\
dsp/dspdeviceengine.cpp\ dsp/dspdevicesourceengine.cpp\
dsp/dvserialengine.cpp\ dsp/dvserialengine.cpp\
dsp/dvserialworker.cpp\ dsp/dvserialworker.cpp\
dsp/fftengine.cpp\ dsp/fftengine.cpp\
@ -112,7 +112,7 @@ HEADERS += mainwindow.h\
dsp/decimators.h\ dsp/decimators.h\
dsp/dspcommands.h\ dsp/dspcommands.h\
dsp/dspengine.h\ dsp/dspengine.h\
dsp/dspdeviceengine.h\ dsp/dspdevicesourceengine.h\
dsp/dvserialengine.h\ dsp/dvserialengine.h\
dsp/dvserialworker.h\ dsp/dvserialworker.h\
dsp/dsptypes.h\ dsp/dsptypes.h\