VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 05:37:50 -04:00
Code Issues Projects Releases Wiki Activity

RxTx semantic move: renamed SampleSink to BasebandSampleSink

Browse Source
This commit is contained in:
f4exb 2016-10-02 22:29:04 +02:00
parent 20c6fb19cc
commit 78513854ac
38 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -115,7 +115,7 @@ set(sdrbase_SOURCES
sdrbase/dsp/pidcontroller.cpp sdrbase/dsp/pidcontroller.cpp
sdrbase/dsp/phaselock.cpp sdrbase/dsp/phaselock.cpp
sdrbase/dsp/samplefifo.cpp sdrbase/dsp/samplefifo.cpp
sdrbase/dsp/samplesink.cpp sdrbase/dsp/basebandsamplesink.cpp
sdrbase/dsp/nullsink.cpp sdrbase/dsp/nullsink.cpp
sdrbase/dsp/spectrumscopecombovis.cpp sdrbase/dsp/spectrumscopecombovis.cpp
sdrbase/dsp/scopevis.cpp sdrbase/dsp/scopevis.cpp
@ -205,7 +205,7 @@ set(sdrbase_HEADERS
sdrbase/dsp/phaselock.h sdrbase/dsp/phaselock.h
sdrbase/dsp/pidcontroller.h sdrbase/dsp/pidcontroller.h
sdrbase/dsp/samplefifo.h sdrbase/dsp/samplefifo.h
sdrbase/dsp/samplesink.h sdrbase/dsp/basebandsamplesink.h
sdrbase/dsp/nullsink.h sdrbase/dsp/nullsink.h
sdrbase/dsp/scopevis.h sdrbase/dsp/scopevis.h
sdrbase/dsp/spectrumvis.h sdrbase/dsp/spectrumvis.h

2
plugins/channelrx/chanalyzer/chanalyzer.cpp
View File

@ -25,7 +25,7 @@
MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgConfigureChannelAnalyzer, Message) MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgConfigureChannelAnalyzer, Message)
ChannelAnalyzer::ChannelAnalyzer(SampleSink* sampleSink) : ChannelAnalyzer::ChannelAnalyzer(BasebandSampleSink* sampleSink) :
m_sampleSink(sampleSink), m_sampleSink(sampleSink),
m_settingsMutex(QMutex::Recursive) m_settingsMutex(QMutex::Recursive)
{ {

8
plugins/channelrx/chanalyzer/chanalyzer.h
View File

@ -17,9 +17,9 @@
#ifndef INCLUDE_CHANALYZER_H #ifndef INCLUDE_CHANALYZER_H
#define INCLUDE_CHANALYZER_H #define INCLUDE_CHANALYZER_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/fftfilt.h" #include "dsp/fftfilt.h"
#include "audio/audiofifo.h" #include "audio/audiofifo.h"
@ -27,9 +27,9 @@
#define ssbFftLen 1024 #define ssbFftLen 1024
class ChannelAnalyzer : public SampleSink { class ChannelAnalyzer : public BasebandSampleSink {
public: public:
ChannelAnalyzer(SampleSink* m_sampleSink); ChannelAnalyzer(BasebandSampleSink* m_sampleSink);
virtual ~ChannelAnalyzer(); virtual ~ChannelAnalyzer();
void configure(MessageQueue* messageQueue, void configure(MessageQueue* messageQueue,
@ -98,7 +98,7 @@ private:
fftfilt* SSBFilter; fftfilt* SSBFilter;
fftfilt* DSBFilter; fftfilt* DSBFilter;
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
QMutex m_settingsMutex; QMutex m_settingsMutex;
}; };

4
plugins/channelrx/demodam/amdemod.h
View File

@ -17,9 +17,9 @@
#ifndef INCLUDE_AMDEMOD_H #ifndef INCLUDE_AMDEMOD_H
#define INCLUDE_AMDEMOD_H #define INCLUDE_AMDEMOD_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "dsp/lowpass.h" #include "dsp/lowpass.h"
@ -28,7 +28,7 @@
#include "audio/audiofifo.h" #include "audio/audiofifo.h"
#include "util/message.h" #include "util/message.h"
class AMDemod : public SampleSink { class AMDemod : public BasebandSampleSink {
Q_OBJECT Q_OBJECT
public: public:
AMDemod(); AMDemod();

2
plugins/channelrx/demodbfm/bfmdemod.cpp
View File

@ -34,7 +34,7 @@ MESSAGE_CLASS_DEFINITION(BFMDemod::MsgConfigureBFMDemod, Message)
const Real BFMDemod::default_deemphasis = 50.0; // 50 us const Real BFMDemod::default_deemphasis = 50.0; // 50 us
BFMDemod::BFMDemod(SampleSink* sampleSink, RDSParser *rdsParser) : BFMDemod::BFMDemod(BasebandSampleSink* sampleSink, RDSParser *rdsParser) :
m_sampleSink(sampleSink), m_sampleSink(sampleSink),
m_rdsParser(rdsParser), m_rdsParser(rdsParser),
m_audioFifo(4, 250000), m_audioFifo(4, 250000),

8
plugins/channelrx/demodbfm/bfmdemod.h
View File

@ -18,9 +18,9 @@
#ifndef INCLUDE_BFMDEMOD_H #ifndef INCLUDE_BFMDEMOD_H
#define INCLUDE_BFMDEMOD_H #define INCLUDE_BFMDEMOD_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "dsp/lowpass.h" #include "dsp/lowpass.h"
@ -37,9 +37,9 @@
class RDSParser; class RDSParser;
class BFMDemod : public SampleSink { class BFMDemod : public BasebandSampleSink {
public: public:
BFMDemod(SampleSink* sampleSink, RDSParser* rdsParser); BFMDemod(BasebandSampleSink* sampleSink, RDSParser* rdsParser);
virtual ~BFMDemod(); virtual ~BFMDemod();
void configure(MessageQueue* messageQueue, void configure(MessageQueue* messageQueue,
@ -201,7 +201,7 @@ private:
AudioVector m_audioBuffer; AudioVector m_audioBuffer;
uint m_audioBufferFill; uint m_audioBufferFill;
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
AudioFifo m_audioFifo; AudioFifo m_audioFifo;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
QMutex m_settingsMutex; QMutex m_settingsMutex;

2
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -32,7 +32,7 @@ static const Real afSqTones[2] = {1200.0, 6400.0}; // {1200.0, 8000.0};
MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureDSDDemod, Message) MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureDSDDemod, Message)
MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureMyPosition, Message) MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureMyPosition, Message)
DSDDemod::DSDDemod(SampleSink* sampleSink) : DSDDemod::DSDDemod(BasebandSampleSink* sampleSink) :
m_sampleCount(0), m_sampleCount(0),
m_squelchCount(0), m_squelchCount(0),
m_squelchOpen(false), m_squelchOpen(false),

8
plugins/channelrx/demoddsd/dsddemod.h
View File

@ -18,10 +18,10 @@
#ifndef INCLUDE_DSDDEMOD_H #ifndef INCLUDE_DSDDEMOD_H
#define INCLUDE_DSDDEMOD_H #define INCLUDE_DSDDEMOD_H
#include <dsp/basebandsamplesink.h>
#include <dsp/phasediscri.h> #include <dsp/phasediscri.h>
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "dsp/lowpass.h" #include "dsp/lowpass.h"
@ -36,9 +36,9 @@
class DSDDemodGUI; class DSDDemodGUI;
class DSDDemod : public SampleSink { class DSDDemod : public BasebandSampleSink {
public: public:
DSDDemod(SampleSink* sampleSink); DSDDemod(BasebandSampleSink* sampleSink);
~DSDDemod(); ~DSDDemod();
void configure(MessageQueue* messageQueue, void configure(MessageQueue* messageQueue,
@ -264,7 +264,7 @@ private:
AudioFifo m_audioFifo1; AudioFifo m_audioFifo1;
AudioFifo m_audioFifo2; AudioFifo m_audioFifo2;
SampleSink* m_scope; BasebandSampleSink* m_scope;
bool m_scopeEnabled; bool m_scopeEnabled;
DSDDecoder m_dsdDecoder; DSDDecoder m_dsdDecoder;

2
plugins/channelrx/demodlora/lorademod.cpp
View File

@ -26,7 +26,7 @@
MESSAGE_CLASS_DEFINITION(LoRaDemod::MsgConfigureLoRaDemod, Message) MESSAGE_CLASS_DEFINITION(LoRaDemod::MsgConfigureLoRaDemod, Message)
LoRaDemod::LoRaDemod(SampleSink* sampleSink) : LoRaDemod::LoRaDemod(BasebandSampleSink* sampleSink) :
m_sampleSink(sampleSink), m_sampleSink(sampleSink),
m_settingsMutex(QMutex::Recursive) m_settingsMutex(QMutex::Recursive)
{ {

8
plugins/channelrx/demodlora/lorademod.h
View File

@ -18,9 +18,9 @@
#ifndef INCLUDE_LoRaDEMOD_H #ifndef INCLUDE_LoRaDEMOD_H
#define INCLUDE_LoRaDEMOD_H #define INCLUDE_LoRaDEMOD_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "util/message.h" #include "util/message.h"
@ -32,9 +32,9 @@
#define LORA_SFFT_LEN (SPREADFACTOR / 2) #define LORA_SFFT_LEN (SPREADFACTOR / 2)
#define LORA_SQUELCH (3) #define LORA_SQUELCH (3)
class LoRaDemod : public SampleSink { class LoRaDemod : public BasebandSampleSink {
public: public:
LoRaDemod(SampleSink* sampleSink); LoRaDemod(BasebandSampleSink* sampleSink);
virtual ~LoRaDemod(); virtual ~LoRaDemod();
void configure(MessageQueue* messageQueue, Real Bandwidth); void configure(MessageQueue* messageQueue, Real Bandwidth);
@ -96,7 +96,7 @@ private:
Interpolator m_interpolator; Interpolator m_interpolator;
Real m_sampleDistanceRemain; Real m_sampleDistanceRemain;
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
QMutex m_settingsMutex; QMutex m_settingsMutex;
}; };

4
plugins/channelrx/demodnfm/nfmdemod.h
View File

@ -18,10 +18,10 @@
#ifndef INCLUDE_NFMDEMOD_H #ifndef INCLUDE_NFMDEMOD_H
#define INCLUDE_NFMDEMOD_H #define INCLUDE_NFMDEMOD_H
#include <dsp/basebandsamplesink.h>
#include <dsp/phasediscri.h> #include <dsp/phasediscri.h>
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "dsp/lowpass.h" #include "dsp/lowpass.h"
@ -35,7 +35,7 @@
class NFMDemodGUI; class NFMDemodGUI;
class NFMDemod : public SampleSink { class NFMDemod : public BasebandSampleSink {
public: public:
NFMDemod(); NFMDemod();
~NFMDemod(); ~NFMDemod();

2
plugins/channelrx/demodssb/ssbdemod.cpp
View File

@ -27,7 +27,7 @@
MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message) MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message)
SSBDemod::SSBDemod(SampleSink* sampleSink) : SSBDemod::SSBDemod(BasebandSampleSink* sampleSink) :
m_sampleSink(sampleSink), m_sampleSink(sampleSink),
m_audioFifo(4, 24000), m_audioFifo(4, 24000),
m_settingsMutex(QMutex::Recursive), m_settingsMutex(QMutex::Recursive),

8
plugins/channelrx/demodssb/ssbdemod.h
View File

@ -18,9 +18,9 @@
#ifndef INCLUDE_SSBDEMOD_H #ifndef INCLUDE_SSBDEMOD_H
#define INCLUDE_SSBDEMOD_H #define INCLUDE_SSBDEMOD_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "dsp/fftfilt.h" #include "dsp/fftfilt.h"
@ -29,9 +29,9 @@
#define ssbFftLen 1024 #define ssbFftLen 1024
class SSBDemod : public SampleSink { class SSBDemod : public BasebandSampleSink {
public: public:
SSBDemod(SampleSink* sampleSink); SSBDemod(BasebandSampleSink* sampleSink);
virtual ~SSBDemod(); virtual ~SSBDemod();
void configure(MessageQueue* messageQueue, void configure(MessageQueue* messageQueue,
@ -135,7 +135,7 @@ private:
fftfilt* SSBFilter; fftfilt* SSBFilter;
fftfilt* DSBFilter; fftfilt* DSBFilter;
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
AudioVector m_audioBuffer; AudioVector m_audioBuffer;

2
plugins/channelrx/demodwfm/wfmdemod.cpp
View File

@ -28,7 +28,7 @@
MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message) MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message)
WFMDemod::WFMDemod(SampleSink* sampleSink) : WFMDemod::WFMDemod(BasebandSampleSink* sampleSink) :
m_sampleSink(sampleSink), m_sampleSink(sampleSink),
m_audioFifo(4, 250000), m_audioFifo(4, 250000),
m_settingsMutex(QMutex::Recursive) m_settingsMutex(QMutex::Recursive)

8
plugins/channelrx/demodwfm/wfmdemod.h
View File

@ -18,9 +18,9 @@
#ifndef INCLUDE_WFMDEMOD_H #ifndef INCLUDE_WFMDEMOD_H
#define INCLUDE_WFMDEMOD_H #define INCLUDE_WFMDEMOD_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include <vector> #include <vector>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
#include "dsp/lowpass.h" #include "dsp/lowpass.h"
@ -32,9 +32,9 @@
#define rfFilterFftLength 1024 #define rfFilterFftLength 1024
class WFMDemod : public SampleSink { class WFMDemod : public BasebandSampleSink {
public: public:
WFMDemod(SampleSink* sampleSink); WFMDemod(BasebandSampleSink* sampleSink);
virtual ~WFMDemod(); virtual ~WFMDemod();
void configure(MessageQueue* messageQueue, Real rfBandwidth, Real afBandwidth, Real volume, Real squelch); void configure(MessageQueue* messageQueue, Real rfBandwidth, Real afBandwidth, Real volume, Real squelch);
@ -127,7 +127,7 @@ private:
AudioVector m_audioBuffer; AudioVector m_audioBuffer;
uint m_audioBufferFill; uint m_audioBufferFill;
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
AudioFifo m_audioFifo; AudioFifo m_audioFifo;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
QMutex m_settingsMutex; QMutex m_settingsMutex;

2
plugins/channelrx/tcpsrc/tcpsrc.cpp
View File

@ -26,7 +26,7 @@ MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConfigure, Message)
MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConnection, Message) MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConnection, Message)
MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcSpectrum, Message) MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcSpectrum, Message)
TCPSrc::TCPSrc(MessageQueue* uiMessageQueue, TCPSrcGUI* tcpSrcGUI, SampleSink* spectrum) : TCPSrc::TCPSrc(MessageQueue* uiMessageQueue, TCPSrcGUI* tcpSrcGUI, BasebandSampleSink* spectrum) :
m_settingsMutex(QMutex::Recursive) m_settingsMutex(QMutex::Recursive)
{ {
setObjectName("TCPSrc"); setObjectName("TCPSrc");

8
plugins/channelrx/tcpsrc/tcpsrc.h
View File

@ -1,9 +1,9 @@
#ifndef INCLUDE_TCPSRC_H #ifndef INCLUDE_TCPSRC_H
#define INCLUDE_TCPSRC_H #define INCLUDE_TCPSRC_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include <QHostAddress> #include <QHostAddress>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/fftfilt.h" #include "dsp/fftfilt.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
@ -15,7 +15,7 @@ class QTcpServer;
class QTcpSocket; class QTcpSocket;
class TCPSrcGUI; class TCPSrcGUI;
class TCPSrc : public SampleSink { class TCPSrc : public BasebandSampleSink {
Q_OBJECT Q_OBJECT
public: public:
@ -26,7 +26,7 @@ public:
FormatNone FormatNone
}; };
TCPSrc(MessageQueue* uiMessageQueue, TCPSrcGUI* tcpSrcGUI, SampleSink* spectrum); TCPSrc(MessageQueue* uiMessageQueue, TCPSrcGUI* tcpSrcGUI, BasebandSampleSink* spectrum);
virtual ~TCPSrc(); virtual ~TCPSrc();
void configure(MessageQueue* messageQueue, SampleFormat sampleFormat, Real outputSampleRate, Real rfBandwidth, int tcpPort, int boost); void configure(MessageQueue* messageQueue, SampleFormat sampleFormat, Real outputSampleRate, Real rfBandwidth, int tcpPort, int boost);
@ -160,7 +160,7 @@ protected:
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
SampleVector m_sampleBufferSSB; SampleVector m_sampleBufferSSB;
SampleSink* m_spectrum; BasebandSampleSink* m_spectrum;
bool m_spectrumEnabled; bool m_spectrumEnabled;
QTcpServer* m_tcpServer; QTcpServer* m_tcpServer;

2
plugins/channelrx/udpsrc/udpsrc.cpp
View File

@ -29,7 +29,7 @@ MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigure, Message)
MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigureImmediate, Message) MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigureImmediate, Message)
MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcSpectrum, Message) MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcSpectrum, Message)
UDPSrc::UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, SampleSink* spectrum) : UDPSrc::UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampleSink* spectrum) :
m_settingsMutex(QMutex::Recursive), m_settingsMutex(QMutex::Recursive),
m_udpPort(9999), m_udpPort(9999),
m_audioFifo(4, 24000), m_audioFifo(4, 24000),

8
plugins/channelrx/udpsrc/udpsrc.h
View File

@ -18,9 +18,9 @@
#ifndef INCLUDE_UDPSRC_H #ifndef INCLUDE_UDPSRC_H
#define INCLUDE_UDPSRC_H #define INCLUDE_UDPSRC_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include <QHostAddress> #include <QHostAddress>
#include "dsp/samplesink.h"
#include "dsp/nco.h" #include "dsp/nco.h"
#include "dsp/fftfilt.h" #include "dsp/fftfilt.h"
#include "dsp/interpolator.h" #include "dsp/interpolator.h"
@ -33,7 +33,7 @@
class QUdpSocket; class QUdpSocket;
class UDPSrcGUI; class UDPSrcGUI;
class UDPSrc : public SampleSink { class UDPSrc : public BasebandSampleSink {
Q_OBJECT Q_OBJECT
public: public:
@ -56,7 +56,7 @@ public:
typedef std::vector<AudioSample> AudioVector; typedef std::vector<AudioSample> AudioVector;
UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, SampleSink* spectrum); UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampleSink* spectrum);
virtual ~UDPSrc(); virtual ~UDPSrc();
void configure(MessageQueue* messageQueue, void configure(MessageQueue* messageQueue,
@ -239,7 +239,7 @@ protected:
uint m_audioBufferFill; uint m_audioBufferFill;
AudioFifo m_audioFifo; AudioFifo m_audioFifo;
SampleSink* m_spectrum; BasebandSampleSink* m_spectrum;
bool m_spectrumEnabled; bool m_spectrumEnabled;
quint32 m_nextSSBId; quint32 m_nextSSBId;

4
sdrbase/device/deviceapi.cpp
View File

@ -42,12 +42,12 @@ DeviceAPI::~DeviceAPI()
{ {
} }
void DeviceAPI::addSink(SampleSink *sink) void DeviceAPI::addSink(BasebandSampleSink *sink)
{ {
m_deviceEngine->addSink(sink); m_deviceEngine->addSink(sink);
} }
void DeviceAPI::removeSink(SampleSink* sink) void DeviceAPI::removeSink(BasebandSampleSink* sink)
{ {
m_deviceEngine->removeSink(sink); m_deviceEngine->removeSink(sink);
} }

6
sdrbase/device/deviceapi.h
View File

@ -28,7 +28,7 @@ class MainWindow;
class DSPDeviceEngine; class DSPDeviceEngine;
class GLSpectrum; class GLSpectrum;
class ChannelWindow; class ChannelWindow;
class SampleSink; class BasebandSampleSink;
class ThreadedSampleSink; class ThreadedSampleSink;
class SampleSource; class SampleSource;
class MessageQueue; class MessageQueue;
@ -43,8 +43,8 @@ class SDRANGEL_API DeviceAPI : public QObject {
public: public:
// Device engine stuff // Device engine stuff
void addSink(SampleSink* sink); //!< Add a sample sink to device engine void addSink(BasebandSampleSink* sink); //!< Add a sample sink to device engine
void removeSink(SampleSink* sink); //!< Remove a sample sink from device engine void removeSink(BasebandSampleSink* sink); //!< Remove a sample sink from device engine
void addThreadedSink(ThreadedSampleSink* sink); //!< Add a sample sink that will run on its own thread to device engine void addThreadedSink(ThreadedSampleSink* sink); //!< Add a sample sink that will run on its own thread to device engine
void removeThreadedSink(ThreadedSampleSink* sink); //!< Remove a sample sink that runs on its own thread from device engine void removeThreadedSink(ThreadedSampleSink* sink); //!< Remove a sample sink that runs on its own thread from device engine
void setSource(SampleSource* source); //!< Set device engine sample source type void setSource(SampleSource* source); //!< Set device engine sample source type

8
sdrbase/dsp/samplesink.cpp → sdrbase/dsp/basebandsamplesink.cpp
View File

@ -1,16 +1,16 @@
#include "dsp/samplesink.h" #include <dsp/basebandsamplesink.h>
#include "util/message.h" #include "util/message.h"
SampleSink::SampleSink() BasebandSampleSink::BasebandSampleSink()
{ {
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
} }
SampleSink::~SampleSink() BasebandSampleSink::~BasebandSampleSink()
{ {
} }
void SampleSink::handleInputMessages() void BasebandSampleSink::handleInputMessages()
{ {
Message* message; Message* message;

6
sdrbase/dsp/samplesink.h → sdrbase/dsp/basebandsamplesink.h
View File

@ -8,11 +8,11 @@
class Message; class Message;
class SDRANGEL_API SampleSink : public QObject { class SDRANGEL_API BasebandSampleSink : public QObject {
Q_OBJECT Q_OBJECT
public: public:
SampleSink(); BasebandSampleSink();
virtual ~SampleSink(); virtual ~BasebandSampleSink();
virtual void start() = 0; virtual void start() = 0;
virtual void stop() = 0; virtual void stop() = 0;

2
sdrbase/dsp/downchannelizer.cpp
View File

@ -7,7 +7,7 @@
MESSAGE_CLASS_DEFINITION(DownChannelizer::MsgChannelizerNotification, Message) MESSAGE_CLASS_DEFINITION(DownChannelizer::MsgChannelizerNotification, Message)
DownChannelizer::DownChannelizer(SampleSink* sampleSink) : DownChannelizer::DownChannelizer(BasebandSampleSink* sampleSink) :
m_sampleSink(sampleSink), m_sampleSink(sampleSink),
m_inputSampleRate(0), m_inputSampleRate(0),
m_requestedOutputSampleRate(0), m_requestedOutputSampleRate(0),

8
sdrbase/dsp/downchannelizer.h
View File

@ -1,16 +1,16 @@
#ifndef INCLUDE_CHANNELIZER_H #ifndef INCLUDE_CHANNELIZER_H
#define INCLUDE_CHANNELIZER_H #define INCLUDE_CHANNELIZER_H
#include <dsp/basebandsamplesink.h>
#include <list> #include <list>
#include <QMutex> #include <QMutex>
#include "dsp/samplesink.h"
#include "util/export.h" #include "util/export.h"
#include "util/message.h" #include "util/message.h"
class MessageQueue; class MessageQueue;
class IntHalfbandFilter; class IntHalfbandFilter;
class SDRANGEL_API DownChannelizer : public SampleSink { class SDRANGEL_API DownChannelizer : public BasebandSampleSink {
Q_OBJECT Q_OBJECT
public: public:
class SDRANGEL_API MsgChannelizerNotification : public Message { class SDRANGEL_API MsgChannelizerNotification : public Message {
@ -31,7 +31,7 @@ public:
qint64 m_frequencyOffset; qint64 m_frequencyOffset;
}; };
DownChannelizer(SampleSink* sampleSink); DownChannelizer(BasebandSampleSink* sampleSink);
virtual ~DownChannelizer(); virtual ~DownChannelizer();
void configure(MessageQueue* messageQueue, int sampleRate, int centerFrequency); void configure(MessageQueue* messageQueue, int sampleRate, int centerFrequency);
@ -64,7 +64,7 @@ protected:
}; };
typedef std::list<FilterStage*> FilterStages; typedef std::list<FilterStage*> FilterStages;
FilterStages m_filterStages; FilterStages m_filterStages;
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
int m_inputSampleRate; int m_inputSampleRate;
int m_requestedOutputSampleRate; int m_requestedOutputSampleRate;
int m_requestedCenterFrequency; int m_requestedCenterFrequency;

14
sdrbase/dsp/dspcommands.h
View File

@ -24,7 +24,7 @@
#include "util/export.h" #include "util/export.h"
class SampleSource; class SampleSource;
class SampleSink; class BasebandSampleSink;
class ThreadedSampleSink; class ThreadedSampleSink;
class AudioFifo; class AudioFifo;
@ -82,24 +82,24 @@ class SDRANGEL_API DSPAddSink : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
DSPAddSink(SampleSink* sampleSink) : Message(), m_sampleSink(sampleSink) { } DSPAddSink(BasebandSampleSink* sampleSink) : Message(), m_sampleSink(sampleSink) { }
SampleSink* getSampleSink() const { return m_sampleSink; } BasebandSampleSink* getSampleSink() const { return m_sampleSink; }
private: private:
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
}; };
class SDRANGEL_API DSPRemoveSink : public Message { class SDRANGEL_API DSPRemoveSink : public Message {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
DSPRemoveSink(SampleSink* sampleSink) : Message(), m_sampleSink(sampleSink) { } DSPRemoveSink(BasebandSampleSink* sampleSink) : Message(), m_sampleSink(sampleSink) { }
SampleSink* getSampleSink() const { return m_sampleSink; } BasebandSampleSink* getSampleSink() const { return m_sampleSink; }
private: private:
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
}; };
class SDRANGEL_API DSPAddThreadedSampleSink : public Message { class SDRANGEL_API DSPAddThreadedSampleSink : public Message {

10
sdrbase/dsp/dspdeviceengine.cpp
View File

@ -15,12 +15,12 @@
// 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 <dsp/basebandsamplesink.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/dspdeviceengine.h"
#include "dsp/samplefifo.h" #include "dsp/samplefifo.h"
#include "dsp/samplesink.h"
#include "dsp/threadedsamplesink.h" #include "dsp/threadedsamplesink.h"
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "dsp/samplesource.h" #include "dsp/samplesource.h"
@ -118,14 +118,14 @@ void DSPDeviceEngine::setSourceSequence(int sequence)
m_sampleSourceSequence = sequence; m_sampleSourceSequence = sequence;
} }
void DSPDeviceEngine::addSink(SampleSink* sink) void DSPDeviceEngine::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(SampleSink* sink) void DSPDeviceEngine::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);
@ -547,12 +547,12 @@ void DSPDeviceEngine::handleSynchronousMessages()
} }
else if (DSPAddSink::match(*message)) else if (DSPAddSink::match(*message))
{ {
SampleSink* sink = ((DSPAddSink*) message)->getSampleSink(); BasebandSampleSink* sink = ((DSPAddSink*) message)->getSampleSink();
m_sampleSinks.push_back(sink); m_sampleSinks.push_back(sink);
} }
else if (DSPRemoveSink::match(*message)) else if (DSPRemoveSink::match(*message))
{ {
SampleSink* sink = ((DSPRemoveSink*) message)->getSampleSink(); BasebandSampleSink* sink = ((DSPRemoveSink*) message)->getSampleSink();
if(m_state == StRunning) { if(m_state == StRunning) {
sink->stop(); sink->stop();

8
sdrbase/dsp/dspdeviceengine.h
View File

@ -30,7 +30,7 @@
#include "util/export.h" #include "util/export.h"
class SampleSource; class SampleSource;
class SampleSink; class BasebandSampleSink;
class ThreadedSampleSink; class ThreadedSampleSink;
class SDRANGEL_API DSPDeviceEngine : public QThread { class SDRANGEL_API DSPDeviceEngine : public QThread {
@ -63,8 +63,8 @@ public:
void setSource(SampleSource* source); //!< Set the sample source type void setSource(SampleSource* source); //!< Set the sample source type
void setSourceSequence(int sequence); //!< Set the sample source sequence in type void setSourceSequence(int sequence); //!< Set the sample source sequence in type
void addSink(SampleSink* sink); //!< Add a sample sink void addSink(BasebandSampleSink* sink); //!< Add a sample sink
void removeSink(SampleSink* sink); //!< Remove a sample sink void removeSink(BasebandSampleSink* sink); //!< Remove a sample sink
void addThreadedSink(ThreadedSampleSink* sink); //!< Add a sample sink that will run on its own thread void addThreadedSink(ThreadedSampleSink* sink); //!< Add a sample sink that will run on its own thread
void removeThreadedSink(ThreadedSampleSink* sink); //!< Remove a sample sink that runs on its own thread void removeThreadedSink(ThreadedSampleSink* sink); //!< Remove a sample sink that runs on its own thread
@ -91,7 +91,7 @@ private:
SampleSource* m_sampleSource; SampleSource* m_sampleSource;
int m_sampleSourceSequence; int m_sampleSourceSequence;
typedef std::list<SampleSink*> SampleSinks; typedef std::list<BasebandSampleSink*> SampleSinks;
SampleSinks m_sampleSinks; //!< sample sinks within main thread (usually spectrum, file output) SampleSinks m_sampleSinks; //!< sample sinks within main thread (usually spectrum, file output)
typedef std::list<ThreadedSampleSink*> ThreadedSampleSinks; typedef std::list<ThreadedSampleSink*> ThreadedSampleSinks;

4
sdrbase/dsp/filerecord.cpp
View File

@ -6,7 +6,7 @@
#include <QDebug> #include <QDebug>
FileRecord::FileRecord() : FileRecord::FileRecord() :
SampleSink(), BasebandSampleSink(),
m_fileName(std::string("test.sdriq")), m_fileName(std::string("test.sdriq")),
m_sampleRate(0), m_sampleRate(0),
m_centerFrequency(0), m_centerFrequency(0),
@ -18,7 +18,7 @@ FileRecord::FileRecord() :
} }
FileRecord::FileRecord(const std::string& filename) : FileRecord::FileRecord(const std::string& filename) :
SampleSink(), BasebandSampleSink(),
m_fileName(std::string(filename)), m_fileName(std::string(filename)),
m_sampleRate(0), m_sampleRate(0),
m_centerFrequency(0), m_centerFrequency(0),

4
sdrbase/dsp/filerecord.h
View File

@ -1,17 +1,17 @@
#ifndef INCLUDE_FILESINK_H #ifndef INCLUDE_FILESINK_H
#define INCLUDE_FILESINK_H #define INCLUDE_FILESINK_H
#include <dsp/basebandsamplesink.h>
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <ctime> #include <ctime>
#include "dsp/samplesink.h"
#include "util/export.h" #include "util/export.h"
class Message; class Message;
class SDRANGEL_API FileRecord : public SampleSink { class SDRANGEL_API FileRecord : public BasebandSampleSink {
public: public:
struct Header struct Header

4
sdrbase/dsp/nullsink.h
View File

@ -1,12 +1,12 @@
#ifndef INCLUDE_NULLSINK_H #ifndef INCLUDE_NULLSINK_H
#define INCLUDE_NULLSINK_H #define INCLUDE_NULLSINK_H
#include "dsp/samplesink.h" #include <dsp/basebandsamplesink.h>
#include "util/export.h" #include "util/export.h"
class Message; class Message;
class SDRANGEL_API NullSink : public SampleSink { class SDRANGEL_API NullSink : public BasebandSampleSink {
public: public:
NullSink(); NullSink();

4
sdrbase/dsp/scopevis.h
View File

@ -2,14 +2,14 @@
#define INCLUDE_SCOPEVIS_H #define INCLUDE_SCOPEVIS_H
#include <boost/circular_buffer.hpp> #include <boost/circular_buffer.hpp>
#include "dsp/samplesink.h" #include <dsp/basebandsamplesink.h>
#include "util/export.h" #include "util/export.h"
#include "util/message.h" #include "util/message.h"
class GLScope; class GLScope;
class MessageQueue; class MessageQueue;
class SDRANGEL_API ScopeVis : public SampleSink { class SDRANGEL_API ScopeVis : public BasebandSampleSink {
public: public:
enum TriggerChannel { enum TriggerChannel {
TriggerFreeRun, TriggerFreeRun,

4
sdrbase/dsp/spectrumscopecombovis.h
View File

@ -1,14 +1,14 @@
#ifndef INCLUDE_SPECTRUMSCOPECOMBOVIS_H #ifndef INCLUDE_SPECTRUMSCOPECOMBOVIS_H
#define INCLUDE_SPECTRUMSCOPECOMBOVIS_H #define INCLUDE_SPECTRUMSCOPECOMBOVIS_H
#include "dsp/samplesink.h" #include <dsp/basebandsamplesink.h>
#include "dsp/spectrumvis.h" #include "dsp/spectrumvis.h"
#include "dsp/scopevis.h" #include "dsp/scopevis.h"
#include "util/export.h" #include "util/export.h"
class Message; class Message;
class SDRANGEL_API SpectrumScopeComboVis : public SampleSink { class SDRANGEL_API SpectrumScopeComboVis : public BasebandSampleSink {
public: public:
SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVis* scopeVis); SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVis* scopeVis);

2
sdrbase/dsp/spectrumvis.cpp
View File

@ -15,7 +15,7 @@ inline double log2f(double n)
MESSAGE_CLASS_DEFINITION(SpectrumVis::MsgConfigureSpectrumVis, Message) MESSAGE_CLASS_DEFINITION(SpectrumVis::MsgConfigureSpectrumVis, Message)
SpectrumVis::SpectrumVis(GLSpectrum* glSpectrum) : SpectrumVis::SpectrumVis(GLSpectrum* glSpectrum) :
SampleSink(), BasebandSampleSink(),
m_fft(FFTEngine::create()), m_fft(FFTEngine::create()),
m_fftBuffer(MAX_FFT_SIZE), m_fftBuffer(MAX_FFT_SIZE),
m_logPowerSpectrum(MAX_FFT_SIZE), m_logPowerSpectrum(MAX_FFT_SIZE),

4
sdrbase/dsp/spectrumvis.h
View File

@ -1,8 +1,8 @@
#ifndef INCLUDE_SPECTRUMVIS_H #ifndef INCLUDE_SPECTRUMVIS_H
#define INCLUDE_SPECTRUMVIS_H #define INCLUDE_SPECTRUMVIS_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include "dsp/samplesink.h"
#include "dsp/fftengine.h" #include "dsp/fftengine.h"
#include "fftwindow.h" #include "fftwindow.h"
#include "util/export.h" #include "util/export.h"
@ -11,7 +11,7 @@
class GLSpectrum; class GLSpectrum;
class MessageQueue; class MessageQueue;
class SDRANGEL_API SpectrumVis : public SampleSink { class SDRANGEL_API SpectrumVis : public BasebandSampleSink {
public: public:
class SDRANGEL_API MsgConfigureSpectrumVis : public Message { class SDRANGEL_API MsgConfigureSpectrumVis : public Message {

4
sdrbase/dsp/threadedsamplesink.cpp
View File

@ -4,7 +4,7 @@
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "util/message.h" #include "util/message.h"
ThreadedSampleFifo::ThreadedSampleFifo(SampleSink *sampleSink, std::size_t size) : ThreadedSampleFifo::ThreadedSampleFifo(BasebandSampleSink *sampleSink, std::size_t size) :
m_sampleSink(sampleSink) m_sampleSink(sampleSink)
{ {
connect(&m_sampleFifo, SIGNAL(dataReady()), this, SLOT(handleFifoData())); connect(&m_sampleFifo, SIGNAL(dataReady()), this, SLOT(handleFifoData()));
@ -62,7 +62,7 @@ void ThreadedSampleFifo::handleFifoData() // FIXME: Fixed? Move it to the new th
} }
} }
ThreadedSampleSink::ThreadedSampleSink(SampleSink* sampleSink, QObject *parent) : ThreadedSampleSink::ThreadedSampleSink(BasebandSampleSink* sampleSink, QObject *parent) :
m_sampleSink(sampleSink) m_sampleSink(sampleSink)
{ {
QString name = "ThreadedSampleSink(" + m_sampleSink->objectName() + ")"; QString name = "ThreadedSampleSink(" + m_sampleSink->objectName() + ")";

14
sdrbase/dsp/threadedsamplesink.h
View File

@ -18,13 +18,13 @@
#ifndef INCLUDE_THREADEDSAMPLESINK_H #ifndef INCLUDE_THREADEDSAMPLESINK_H
#define INCLUDE_THREADEDSAMPLESINK_H #define INCLUDE_THREADEDSAMPLESINK_H
#include <dsp/basebandsamplesink.h>
#include <QMutex> #include <QMutex>
#include "samplesink.h"
#include "dsp/samplefifo.h" #include "dsp/samplefifo.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"
#include "util/export.h" #include "util/export.h"
class SampleSink; class BasebandSampleSink;
class QThread; class QThread;
/** /**
@ -35,11 +35,11 @@ class ThreadedSampleFifo : public QObject {
Q_OBJECT Q_OBJECT
public: public:
ThreadedSampleFifo(SampleSink* sampleSink, std::size_t size = 1<<18); ThreadedSampleFifo(BasebandSampleSink* sampleSink, std::size_t size = 1<<18);
~ThreadedSampleFifo(); ~ThreadedSampleFifo();
void writeToFifo(SampleVector::const_iterator& begin, SampleVector::const_iterator& end); void writeToFifo(SampleVector::const_iterator& begin, SampleVector::const_iterator& end);
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
SampleFifo m_sampleFifo; SampleFifo m_sampleFifo;
public slots: public slots:
@ -53,10 +53,10 @@ class SDRANGEL_API ThreadedSampleSink : public QObject {
Q_OBJECT Q_OBJECT
public: public:
ThreadedSampleSink(SampleSink* sampleSink, QObject *parent = 0); ThreadedSampleSink(BasebandSampleSink* sampleSink, QObject *parent = 0);
~ThreadedSampleSink(); ~ThreadedSampleSink();
const SampleSink *getSink() const { return m_sampleSink; } const BasebandSampleSink *getSink() const { return m_sampleSink; }
MessageQueue* getInputMessageQueue() { return m_sampleSink->getInputMessageQueue(); } //!< Return pointer to sample sink's input message queue MessageQueue* getInputMessageQueue() { return m_sampleSink->getInputMessageQueue(); } //!< Return pointer to sample sink's input message queue
MessageQueue* getOutputMessageQueue() { return m_sampleSink->getOutputMessageQueue(); } //!< Return pointer to sample sink's output message queue MessageQueue* getOutputMessageQueue() { return m_sampleSink->getOutputMessageQueue(); } //!< Return pointer to sample sink's output message queue
@ -72,7 +72,7 @@ protected:
QThread *m_thread; //!< The thead object QThread *m_thread; //!< The thead object
ThreadedSampleFifo *m_threadedSampleFifo; ThreadedSampleFifo *m_threadedSampleFifo;
SampleSink* m_sampleSink; BasebandSampleSink* m_sampleSink;
}; };
#endif // INCLUDE_THREADEDSAMPLESINK_H #endif // INCLUDE_THREADEDSAMPLESINK_H

4
sdrbase/sdrbase.pro
View File

@ -56,7 +56,7 @@ SOURCES += mainwindow.cpp\
dsp/pidcontroller.cpp\ dsp/pidcontroller.cpp\
dsp/phaselock.cpp\ dsp/phaselock.cpp\
dsp/samplefifo.cpp\ dsp/samplefifo.cpp\
dsp/samplesink.cpp\ dsp/basebandsamplesink.cpp\
dsp/nullsink.cpp\ dsp/nullsink.cpp\
dsp/spectrumscopecombovis.cpp\ dsp/spectrumscopecombovis.cpp\
dsp/scopevis.cpp\ dsp/scopevis.cpp\
@ -136,7 +136,7 @@ HEADERS += mainwindow.h\
dsp/phaselock.h\ dsp/phaselock.h\
dsp/pidcontroller.h\ dsp/pidcontroller.h\
dsp/samplefifo.h\ dsp/samplefifo.h\
dsp/samplesink.h\ dsp/basebandsamplesink.h\
dsp/nullsink.h\ dsp/nullsink.h\
dsp/scopevis.h\ dsp/scopevis.h\
dsp/spectrumvis.h\ dsp/spectrumvis.h\