VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-24 11:04:10 -04:00
Code Issues Projects Releases Wiki Activity

RxTx semantic move: renamed FileSink to FileRecord

Browse Source
This commit is contained in:
f4exb
2016-10-02 10:30:58 +02:00
parent a8247b8b42
commit 1fa80272b5
23 changed files with 74 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspy/airspygui.cpp
+4 -2
View File
@@ -20,13 +20,15 @@
#include <libairspy/airspy.h>
#include "airspygui.h"
#include <dsp/filerecord.h>
#include "ui_airspygui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
AirspyGui::AirspyGui(DeviceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
@@ -54,7 +56,7 @@ AirspyGui::AirspyGui(DeviceAPI *deviceAPI, QWidget* parent) :
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
plugins/samplesource/airspy/airspygui.h
+2 -2
View File
@@ -25,7 +25,7 @@
#define AIRSPY_MAX_DEVICE (32)
class DeviceAPI;
class FileSink;
class FileRecord;
namespace Ui {
class AirspyGui;
@@ -61,7 +61,7 @@ private:
QTimer m_statusTimer;
std::vector<uint32_t> m_rates;
SampleSource* m_sampleSource;
FileSink *m_fileSink; //!< File sink to record device I/Q output
FileRecord *m_fileSink; //!< File sink to record device I/Q output
int m_sampleRate;
quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState;
plugins/samplesource/bladerf/bladerfgui.cpp
+2 -2
View File
@@ -25,8 +25,8 @@
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
#include "bladerfgui.h"
#include <dsp/filerecord.h>
BladerfGui::BladerfGui(DeviceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
@@ -64,7 +64,7 @@ BladerfGui::BladerfGui(DeviceAPI *deviceAPI, QWidget* parent) :
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
plugins/samplesource/bladerf/bladerfgui.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "bladerfinput.h"
class DeviceAPI;
class FileSink;
class FileRecord;
namespace Ui {
class BladerfGui;
@@ -57,7 +57,7 @@ private:
QTimer m_statusTimer;
std::vector<int> m_gains;
SampleSource* m_sampleSource;
FileSink *m_fileSink; //!< File sink to record device I/Q output
FileRecord *m_fileSink; //!< File sink to record device I/Q output
int m_sampleRate;
quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState;
plugins/samplesource/fcdpro/fcdprogui.cpp
+3 -2
View File
@@ -22,8 +22,9 @@
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
#include "fcdprogui.h"
#include <dsp/filerecord.h>
#include "fcdproconst.h"
FCDProGui::FCDProGui(DeviceAPI *deviceAPI, QWidget* parent) :
@@ -145,7 +146,7 @@ FCDProGui::FCDProGui(DeviceAPI *deviceAPI, QWidget* parent) :
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
plugins/samplesource/fcdpro/fcdprogui.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "plugin/plugingui.h"
class DeviceAPI;
class FileSink;
class FileRecord;
class QWidget;
namespace Ui {
@@ -58,7 +58,7 @@ private:
QTimer m_statusTimer;
std::vector<int> m_gains;
SampleSource* m_sampleSource;
FileSink *m_fileSink; //!< File sink to record device I/Q output
FileRecord *m_fileSink; //!< File sink to record device I/Q output
int m_sampleRate;
quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState;
plugins/samplesource/fcdproplus/fcdproplusgui.cpp
+3 -2
View File
@@ -23,8 +23,9 @@
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
#include "fcdproplusgui.h"
#include <dsp/filerecord.h>
#include "fcdproplusconst.h"
FCDProPlusGui::FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent) :
@@ -63,7 +64,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceAPI *deviceAPI, QWidget* parent) :
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
plugins/samplesource/fcdproplus/fcdproplusgui.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "plugin/plugingui.h"
class DeviceAPI;
class FileSink;
class FileRecord;
namespace Ui {
class FCDProPlusGui;
@@ -57,7 +57,7 @@ private:
QTimer m_statusTimer;
std::vector<int> m_gains;
SampleSource* m_sampleSource;
FileSink *m_fileSink; //!< File sink to record device I/Q output
FileRecord *m_fileSink; //!< File sink to record device I/Q output
int m_sampleRate;
quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState;
plugins/samplesource/filesource/filesourceinput.cpp
+7 -6
View File
@@ -21,10 +21,11 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "dsp/filesink.h"
#include "filesourcegui.h"
#include "filesourceinput.h"
#include <dsp/filerecord.h>
#include "filesourcethread.h"
MESSAGE_CLASS_DEFINITION(FileSourceInput::MsgConfigureFileSource, Message)
@@ -101,15 +102,15 @@ void FileSourceInput::openFileStream()
m_ifstream.open(m_fileName.toStdString().c_str(), std::ios::binary | std::ios::ate);
quint64 fileSize = m_ifstream.tellg();
m_ifstream.seekg(0,std::ios_base::beg);
FileSink::Header header;
FileSink::readHeader(m_ifstream, header);
FileRecord::Header header;
FileRecord::readHeader(m_ifstream, header);
m_sampleRate = header.sampleRate;
m_centerFrequency = header.centerFrequency;
m_startingTimeStamp = header.startTimeStamp;
if (fileSize > sizeof(FileSink::Header)) {
m_recordLength = (fileSize - sizeof(FileSink::Header)) / (4 * m_sampleRate);
if (fileSize > sizeof(FileRecord::Header)) {
m_recordLength = (fileSize - sizeof(FileRecord::Header)) / (4 * m_sampleRate);
} else {
m_recordLength = 0;
}
plugins/samplesource/hackrf/hackrfgui.cpp
+4 -2
View File
@@ -24,8 +24,10 @@
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
#include "hackrfgui.h"
#include <dsp/filerecord.h>
#include "ui_hackrfgui.h"
HackRFGui::HackRFGui(DeviceAPI *deviceAPI, QWidget* parent) :
@@ -55,7 +57,7 @@ HackRFGui::HackRFGui(DeviceAPI *deviceAPI, QWidget* parent) :
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
plugins/samplesource/hackrf/hackrfgui.h
+2 -2
View File
@@ -25,7 +25,7 @@
#define HACKRF_MAX_DEVICE (32)
class DeviceAPI;
class FileSink;
class FileRecord;
namespace Ui {
class HackRFGui;
@@ -65,7 +65,7 @@ private:
QTimer m_updateTimer;
QTimer m_statusTimer;
SampleSource* m_sampleSource;
FileSink *m_fileSink; //!< File sink to record device I/Q output
FileRecord *m_fileSink; //!< File sink to record device I/Q output
int m_sampleRate;
quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState;
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+4 -2
View File
@@ -18,13 +18,15 @@
#include <QMessageBox>
#include "rtlsdrgui.h"
#include <dsp/filerecord.h>
#include "ui_rtlsdrgui.h"
#include "device/deviceapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
RTLSDRGui::RTLSDRGui(DeviceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
@@ -57,7 +59,7 @@ RTLSDRGui::RTLSDRGui(DeviceAPI *deviceAPI, QWidget* parent) :
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
plugins/samplesource/rtlsdr/rtlsdrgui.h
+2 -2
View File
@@ -22,7 +22,7 @@
#include "rtlsdrinput.h"
class DeviceAPI;
class FileSink;
class FileRecord;
namespace Ui {
class RTLSDRGui;
@@ -56,7 +56,7 @@ private:
QTimer m_statusTimer;
std::vector<int> m_gains;
SampleSource* m_sampleSource;
FileSink *m_fileSink; //!< File sink to record device I/Q output
FileRecord *m_fileSink; //!< File sink to record device I/Q output
int m_sampleRate;
quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState;
plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
+2 -2
View File
@@ -35,11 +35,11 @@
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
#include "mainwindow.h"
#include "util/simpleserializer.h"
#include "sdrdaemongui.h"
#include <dsp/filerecord.h>
SDRdaemonGui::SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
@@ -98,7 +98,7 @@ SDRdaemonGui::SDRdaemonGui(DeviceAPI *deviceAPI, QWidget* parent) :
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
plugins/samplesource/sdrdaemon/sdrdaemongui.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "sdrdaemoninput.h"
class DeviceAPI;
class FileSink;
class FileRecord;
namespace Ui {
class SDRdaemonGui;
@@ -56,7 +56,7 @@ private:
QTimer m_statusTimer;
SampleSource* m_sampleSource;
bool m_acquisition;
FileSink *m_fileSink; //!< File sink to record device I/Q output
FileRecord *m_fileSink; //!< File sink to record device I/Q output
int m_deviceSampleRate;
quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState;
plugins/samplesource/sdrdaemon/sdrdaemoninput.cpp
+3 -2
View File
@@ -22,10 +22,11 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "dsp/filesink.h"
#include "sdrdaemongui.h"
#include "sdrdaemoninput.h"
#include <dsp/filerecord.h>
#include "sdrdaemonudphandler.h"
MESSAGE_CLASS_DEFINITION(SDRdaemonInput::MsgConfigureSDRdaemonUDPLink, Message)
plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp
+2 -2
View File
@@ -35,11 +35,11 @@
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
#include "mainwindow.h"
#include "util/simpleserializer.h"
#include "sdrdaemonfecgui.h"
#include <dsp/filerecord.h>
SDRdaemonFECGui::SDRdaemonFECGui(DeviceAPI *deviceAPI, QWidget* parent) :
QWidget(parent),
@@ -96,7 +96,7 @@ SDRdaemonFECGui::SDRdaemonFECGui(DeviceAPI *deviceAPI, QWidget* parent) :
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink);
connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "sdrdaemonfecinput.h"
class DeviceAPI;
class FileSink;
class FileRecord;
namespace Ui {
class SDRdaemonFECGui;
@@ -56,7 +56,7 @@ private:
QTimer m_statusTimer;
SampleSource* m_sampleSource;
bool m_acquisition;
FileSink *m_fileSink; //!< File sink to record device I/Q output
FileRecord *m_fileSink; //!< File sink to record device I/Q output
int m_deviceSampleRate;
quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState;
plugins/samplesource/sdrdaemonfec/sdrdaemonfecinput.cpp
+2 -2
View File
@@ -22,10 +22,10 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "dsp/filesink.h"
#include "sdrdaemonfecinput.h"
#include <dsp/filerecord.h>
#include "sdrdaemonfecgui.h"
#include "sdrdaemonfecudphandler.h"