VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 00:44:48 -04:00
Code Issues Projects Releases Wiki Activity

RxTx semantic move: renamed SampleFifo to SampleSinkFifo

Browse Source
This commit is contained in:
f4exb
2016-10-06 19:18:02 +02:00
parent 12ac603741
commit 36aeaa3ea5
28 changed files with 86 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspy/airspythread.cpp
+3 -2
View File
@@ -18,11 +18,12 @@
#include <errno.h>
#include "airspythread.h"
#include "dsp/samplefifo.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
AirspyThread *AirspyThread::m_this = 0;
AirspyThread::AirspyThread(struct airspy_device* dev, SampleFifo* sampleFifo, QObject* parent) :
AirspyThread::AirspyThread(struct airspy_device* dev, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
m_running(false),
m_dev(dev),
plugins/samplesource/airspy/airspythread.h
+4 -3
View File
@@ -21,7 +21,8 @@
#include <QMutex>
#include <QWaitCondition>
#include <libairspy/airspy.h>
#include "dsp/samplefifo.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/decimators.h"
#define AIRSPY_BLOCKSIZE (1<<17)
@@ -30,7 +31,7 @@ class AirspyThread : public QThread {
Q_OBJECT
public:
AirspyThread(struct airspy_device* dev, SampleFifo* sampleFifo, QObject* parent = NULL);
AirspyThread(struct airspy_device* dev, SampleSinkFifo* sampleFifo, QObject* parent = NULL);
~AirspyThread();
void startWork();
@@ -47,7 +48,7 @@ private:
struct airspy_device* m_dev;
qint16 m_buf[2*AIRSPY_BLOCKSIZE];
SampleVector m_convertBuffer;
SampleFifo* m_sampleFifo;
SampleSinkFifo* m_sampleFifo;
int m_samplerate;
unsigned int m_log2Decim;
plugins/samplesource/bladerf/bladerfthread.cpp
+2 -2
View File
@@ -16,12 +16,12 @@
#include <stdio.h>
#include <errno.h>
#include "dsp/samplefifo.h"
#include "bladerfthread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
BladerfThread::BladerfThread(struct bladerf* dev, SampleFifo* sampleFifo, QObject* parent) :
BladerfThread::BladerfThread(struct bladerf* dev, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
m_running(false),
m_dev(dev),
plugins/samplesource/bladerf/bladerfthread.h
+3 -3
View File
@@ -21,7 +21,7 @@
#include <QMutex>
#include <QWaitCondition>
#include <libbladeRF.h>
#include "dsp/samplefifo.h"
#include "dsp/samplesinkfifo.h"
//#include "dsp/inthalfbandfilter.h"
#include "dsp/decimators.h"
@@ -31,7 +31,7 @@ class BladerfThread : public QThread {
Q_OBJECT
public:
BladerfThread(struct bladerf* dev, SampleFifo* sampleFifo, QObject* parent = NULL);
BladerfThread(struct bladerf* dev, SampleSinkFifo* sampleFifo, QObject* parent = NULL);
~BladerfThread();
void startWork();
@@ -48,7 +48,7 @@ private:
struct bladerf* m_dev;
qint16 m_buf[2*BLADERF_BLOCKSIZE];
SampleVector m_convertBuffer;
SampleFifo* m_sampleFifo;
SampleSinkFifo* m_sampleFifo;
int m_samplerate;
unsigned int m_log2Decim;
plugins/samplesource/fcdpro/fcdprothread.cpp
+3 -2
View File
@@ -18,11 +18,12 @@
#include <QDebug>
#include <stdio.h>
#include <errno.h>
#include "dsp/samplefifo.h"
#include "fcdprothread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "fcdtraits.h"
FCDProThread::FCDProThread(SampleFifo* sampleFifo, QObject* parent) :
FCDProThread::FCDProThread(SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
fcd_handle(NULL),
m_running(false),
plugins/samplesource/fcdpro/fcdprothread.h
+3 -3
View File
@@ -20,15 +20,15 @@
#include <QThread>
#include <QMutex>
#include <QWaitCondition>
#include "dsp/samplefifo.h"
#include "dsp/inthalfbandfilter.h"
#include <alsa/asoundlib.h>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
class FCDProThread : public QThread {
Q_OBJECT
public:
FCDProThread(SampleFifo* sampleFifo, QObject* parent = NULL);
FCDProThread(SampleSinkFifo* sampleFifo, QObject* parent = NULL);
~FCDProThread();
void startWork();
@@ -44,7 +44,7 @@ private:
bool m_running;
SampleVector m_convertBuffer;
SampleFifo* m_sampleFifo;
SampleSinkFifo* m_sampleFifo;
void run();
int work(int n_items);
plugins/samplesource/fcdproplus/fcdproplusreader.cpp
+3 -2
View File
@@ -24,11 +24,12 @@
#include <stdio.h>
#include <errno.h>
#include "dsp/samplefifo.h"
#include "fcdproplusreader.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "fcdtraits.h"
FCDProPlusReader::FCDProPlusReader(SampleFifo* sampleFifo, QObject* parent) :
FCDProPlusReader::FCDProPlusReader(SampleSinkFifo* sampleFifo, QObject* parent) :
QObject(parent),
m_fcdAudioInput(0),
m_fcdInput(0),
plugins/samplesource/fcdproplus/fcdproplusreader.h
+3 -3
View File
@@ -22,7 +22,7 @@
#include <QWaitCondition>
#include <QByteArray>
#include "dsp/samplefifo.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/inthalfbandfilter.h"
class QAudioInput;
@@ -33,7 +33,7 @@ class FCDProPlusReader : public QObject {
Q_OBJECT
public:
FCDProPlusReader(SampleFifo* sampleFifo, QObject* parent = NULL);
FCDProPlusReader(SampleSinkFifo* sampleFifo, QObject* parent = NULL);
~FCDProPlusReader();
void startWork();
@@ -49,7 +49,7 @@ private:
SampleVector m_convertBuffer;
QByteArray m_fcdBuffer;
SampleFifo* m_sampleFifo;
SampleSinkFifo* m_sampleFifo;
void openFcdAudio(const QAudioDeviceInfo& fcdAudioDeviceInfo);
plugins/samplesource/fcdproplus/fcdproplusthread.cpp
+3 -2
View File
@@ -18,11 +18,12 @@
#include <QDebug>
#include <stdio.h>
#include <errno.h>
#include "dsp/samplefifo.h"
#include "fcdproplusthread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "fcdtraits.h"
FCDProPlusThread::FCDProPlusThread(SampleFifo* sampleFifo, QObject* parent) :
FCDProPlusThread::FCDProPlusThread(SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
fcd_handle(NULL),
m_running(false),
plugins/samplesource/fcdproplus/fcdproplusthread.h
+3 -3
View File
@@ -21,15 +21,15 @@
#include <QThread>
#include <QMutex>
#include <QWaitCondition>
#include "dsp/samplefifo.h"
#include "dsp/inthalfbandfilter.h"
#include <alsa/asoundlib.h>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
class FCDProPlusThread : public QThread {
Q_OBJECT
public:
FCDProPlusThread(SampleFifo* sampleFifo, QObject* parent = NULL);
FCDProPlusThread(SampleSinkFifo* sampleFifo, QObject* parent = NULL);
~FCDProPlusThread();
void startWork();
@@ -45,7 +45,7 @@ private:
bool m_running;
SampleVector m_convertBuffer;
SampleFifo* m_sampleFifo;
SampleSinkFifo* m_sampleFifo;
void run();
int work(int n_items);
plugins/samplesource/filesource/filesourcethread.cpp
+2 -2
View File
@@ -17,12 +17,12 @@
#include <stdio.h>
#include <errno.h>
#include <assert.h>
#include "dsp/samplefifo.h"
#include <QDebug>
#include "filesourcethread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
FileSourceThread::FileSourceThread(std::ifstream *samplesStream, SampleFifo* sampleFifo, QObject* parent) :
FileSourceThread::FileSourceThread(std::ifstream *samplesStream, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
m_running(false),
m_ifstream(samplesStream),
plugins/samplesource/filesource/filesourcethread.h
+4 -3
View File
@@ -25,7 +25,8 @@
#include <iostream>
#include <fstream>
#include <cstdlib>
#include "dsp/samplefifo.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/inthalfbandfilter.h"
#define FILESOURCE_THROTTLE_MS 50
@@ -34,7 +35,7 @@ class FileSourceThread : public QThread {
Q_OBJECT
public:
FileSourceThread(std::ifstream *samplesStream, SampleFifo* sampleFifo, QObject* parent = NULL);
FileSourceThread(std::ifstream *samplesStream, SampleSinkFifo* sampleFifo, QObject* parent = NULL);
~FileSourceThread();
void startWork();
@@ -56,7 +57,7 @@ private:
quint8 *m_buf;
std::size_t m_bufsize;
std::size_t m_chunksize;
SampleFifo* m_sampleFifo;
SampleSinkFifo* m_sampleFifo;
std::size_t m_samplesCount;
int m_samplerate;
plugins/samplesource/hackrf/hackrfthread.cpp
+2 -2
View File
@@ -17,12 +17,12 @@
#include <stdio.h>
#include <errno.h>
#include "dsp/samplefifo.h"
#include "hackrfthread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
HackRFThread *HackRFThread::m_this = 0;
HackRFThread::HackRFThread(hackrf_device* dev, SampleFifo* sampleFifo, QObject* parent) :
HackRFThread::HackRFThread(hackrf_device* dev, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
m_running(false),
m_dev(dev),
plugins/samplesource/hackrf/hackrfthread.h
+4 -3
View File
@@ -21,7 +21,8 @@
#include <QMutex>
#include <QWaitCondition>
#include <libhackrf/hackrf.h>
#include "dsp/samplefifo.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/decimators.h"
#define HACKRF_BLOCKSIZE (1<<17)
@@ -30,7 +31,7 @@ class HackRFThread : public QThread {
Q_OBJECT
public:
HackRFThread(hackrf_device* dev, SampleFifo* sampleFifo, QObject* parent = NULL);
HackRFThread(hackrf_device* dev, SampleSinkFifo* sampleFifo, QObject* parent = NULL);
~HackRFThread();
void startWork();
@@ -47,7 +48,7 @@ private:
hackrf_device* m_dev;
qint16 m_buf[2*HACKRF_BLOCKSIZE];
SampleVector m_convertBuffer;
SampleFifo* m_sampleFifo;
SampleSinkFifo* m_sampleFifo;
int m_samplerate;
unsigned int m_log2Decim;
plugins/samplesource/rtlsdr/rtlsdrthread.cpp
+3 -2
View File
@@ -18,11 +18,12 @@
#include <stdio.h>
#include <errno.h>
#include "rtlsdrthread.h"
#include "dsp/samplefifo.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#define FCD_BLOCKSIZE 16384
RTLSDRThread::RTLSDRThread(rtlsdr_dev_t* dev, SampleFifo* sampleFifo, QObject* parent) :
RTLSDRThread::RTLSDRThread(rtlsdr_dev_t* dev, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
m_running(false),
m_dev(dev),
plugins/samplesource/rtlsdr/rtlsdrthread.h
+4 -4
View File
@@ -22,15 +22,15 @@
#include <QMutex>
#include <QWaitCondition>
#include <rtl-sdr.h>
#include "dsp/samplefifo.h"
//#include "dsp/inthalfbandfilter.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "dsp/decimators.h"
class RTLSDRThread : public QThread {
Q_OBJECT
public:
RTLSDRThread(rtlsdr_dev_t* dev, SampleFifo* sampleFifo, QObject* parent = NULL);
RTLSDRThread(rtlsdr_dev_t* dev, SampleSinkFifo* sampleFifo, QObject* parent = NULL);
~RTLSDRThread();
void startWork();
@@ -46,7 +46,7 @@ private:
rtlsdr_dev_t* m_dev;
SampleVector m_convertBuffer;
SampleFifo* m_sampleFifo;
SampleSinkFifo* m_sampleFifo;
int m_samplerate;
unsigned int m_log2Decim;
plugins/samplesource/sdrdaemon/sdrdaemonbufferold.h
+1 -1
View File
@@ -21,8 +21,8 @@
#include <cstring>
#include <cstddef>
#include <lz4.h>
#include "../../../sdrbase/dsp/samplesinkfifo.h"
#include "util/CRC64.h"
#include "dsp/samplefifo.h"
class SDRdaemonBufferOld
{
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "sdrdaemonudphandler.h"
#include "sdrdaemoninput.h"
SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *devieAPI) :
SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *devieAPI) :
m_deviceAPI(devieAPI),
m_sdrDaemonBuffer(m_rateDivider),
m_dataSocket(0),
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h
+3 -3
View File
@@ -27,7 +27,7 @@
#define SDRDAEMON_THROTTLE_MS 50
class SampleFifo;
class SampleSinkFifo;
class MessageQueue;
class QTimer;
class DeviceAPI;
@@ -36,7 +36,7 @@ class SDRdaemonUDPHandler : public QObject
{
Q_OBJECT
public:
SDRdaemonUDPHandler(SampleFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *deviceAPI);
SDRdaemonUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *deviceAPI);
~SDRdaemonUDPHandler();
void connectTimer(const QTimer* timer);
void start();
@@ -59,7 +59,7 @@ private:
bool m_dataConnected;
char *m_udpBuf;
qint64 m_udpReadBytes;
SampleFifo *m_sampleFifo;
SampleSinkFifo *m_sampleFifo;
uint32_t m_samplerate;
uint32_t m_centerFrequency;
uint32_t m_tv_sec;
plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "sdrdaemonfecinput.h"
#include "sdrdaemonfecudphandler.h"
SDRdaemonFECUDPHandler::SDRdaemonFECUDPHandler(SampleFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *devieAPI) :
SDRdaemonFECUDPHandler::SDRdaemonFECUDPHandler(SampleSinkFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *devieAPI) :
m_deviceAPI(devieAPI),
m_sdrDaemonBuffer(m_rateDivider),
m_dataSocket(0),
plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h
+3 -3
View File
@@ -27,7 +27,7 @@
#define SDRDAEMONFEC_THROTTLE_MS 50
class SampleFifo;
class SampleSinkFifo;
class MessageQueue;
class QTimer;
class DeviceAPI;
@@ -36,7 +36,7 @@ class SDRdaemonFECUDPHandler : public QObject
{
Q_OBJECT
public:
SDRdaemonFECUDPHandler(SampleFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *deviceAPI);
SDRdaemonFECUDPHandler(SampleSinkFifo* sampleFifo, MessageQueue *outputMessageQueueToGUI, DeviceAPI *deviceAPI);
~SDRdaemonFECUDPHandler();
void connectTimer(const QTimer* timer);
void start();
@@ -57,7 +57,7 @@ private:
bool m_dataConnected;
char *m_udpBuf;
qint64 m_udpReadBytes;
SampleFifo *m_sampleFifo;
SampleSinkFifo *m_sampleFifo;
uint32_t m_samplerate;
uint32_t m_centerFrequency;
uint32_t m_tv_sec;