VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

File record default file name fix (1)

Browse Source
This commit is contained in:
f4exb 2018-05-08 11:03:09 +02:00
parent 4bb63bbf1b
commit 0981d04904
17 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,7 @@ AirspyInput::AirspyInput(DeviceSourceAPI *deviceAPI) :
m_running(false) m_running(false)
{ {
openDevice(); openDevice();
m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

5
plugins/samplesource/airspyhf/airspyhfinput.cpp
View File

@ -50,10 +50,7 @@ AirspyHFInput::AirspyHFInput(DeviceSourceAPI *deviceAPI) :
m_running(false) m_running(false)
{ {
openDevice(); openDevice();
m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

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

@ -45,10 +45,7 @@ BladerfInput::BladerfInput(DeviceSourceAPI *deviceAPI) :
m_running(false) m_running(false)
{ {
openDevice(); openDevice();
m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
m_deviceAPI->setBuddySharedPtr(&m_sharedParams); m_deviceAPI->setBuddySharedPtr(&m_sharedParams);

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

@ -49,10 +49,7 @@ FCDProInput::FCDProInput(DeviceSourceAPI *deviceAPI) :
m_running(false) m_running(false)
{ {
openDevice(); openDevice();
m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

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

@ -48,10 +48,7 @@ FCDProPlusInput::FCDProPlusInput(DeviceSourceAPI *deviceAPI) :
m_running(false) m_running(false)
{ {
openDevice(); openDevice();
m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

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

@ -49,9 +49,7 @@ HackRFInput::HackRFInput(DeviceSourceAPI *deviceAPI) :
{ {
openDevice(); openDevice();
char recFileNameCStr[30]; m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
m_deviceAPI->setBuddySharedPtr(&m_sharedParams); m_deviceAPI->setBuddySharedPtr(&m_sharedParams);
@ -260,9 +258,18 @@ bool HackRFInput::handleMessage(const Message& message)
MsgFileRecord& conf = (MsgFileRecord&) message; MsgFileRecord& conf = (MsgFileRecord&) message;
qDebug() << "HackRFInput::handleMessage: MsgFileRecord: " << conf.getStartStop(); qDebug() << "HackRFInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
if (conf.getStartStop()) { if (conf.getStartStop())
m_fileSink->startRecording(); {
if (m_settings.m_fileRecordName.size() != 0) {
m_fileSink->setFileName(m_settings.m_fileRecordName);
} else { } else {
m_fileSink->setFileName(QString("rec_%1_%2.sdriq").arg(m_deviceAPI->getDeviceUID()).arg(QDateTime::currentDateTimeUtc().toString("yyyy-MM-ddThh:mm:ss")));
}
m_fileSink->startRecording();
}
else
{
m_fileSink->stopRecording(); m_fileSink->stopRecording();
} }

1
plugins/samplesource/hackrfinput/hackrfinputsettings.cpp
View File

@ -40,6 +40,7 @@ void HackRFInputSettings::resetToDefaults()
m_iqCorrection = false; m_iqCorrection = false;
m_devSampleRate = 2400000; m_devSampleRate = 2400000;
m_linkTxFrequency = false; m_linkTxFrequency = false;
m_fileRecordName = "";
} }
QByteArray HackRFInputSettings::serialize() const QByteArray HackRFInputSettings::serialize() const

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

@ -18,6 +18,7 @@
#define _HACKRF_HACKRFINPUTSETTINGS_H_ #define _HACKRF_HACKRFINPUTSETTINGS_H_
#include <QtGlobal> #include <QtGlobal>
#include <QString>
struct HackRFInputSettings { struct HackRFInputSettings {
typedef enum { typedef enum {
@ -39,6 +40,7 @@ struct HackRFInputSettings {
bool m_dcBlock; bool m_dcBlock;
bool m_iqCorrection; bool m_iqCorrection;
bool m_linkTxFrequency; bool m_linkTxFrequency;
QString m_fileRecordName;
HackRFInputSettings(); HackRFInputSettings();
void resetToDefaults(); void resetToDefaults();

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

@ -57,9 +57,7 @@ LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) :
resumeTxBuddies(); resumeTxBuddies();
resumeRxBuddies(); resumeRxBuddies();
char recFileNameCStr[30]; m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

4
plugins/samplesource/perseus/perseusinput.cpp
View File

@ -41,9 +41,7 @@ PerseusInput::PerseusInput(DeviceSourceAPI *deviceAPI) :
m_perseusDescriptor(0) m_perseusDescriptor(0)
{ {
openDevice(); openDevice();
char recFileNameCStr[30]; m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

4
plugins/samplesource/plutosdrinput/plutosdrinput.cpp
View File

@ -55,9 +55,7 @@ PlutoSDRInput::PlutoSDRInput(DeviceSourceAPI *deviceAPI) :
openDevice(); openDevice();
resumeBuddies(); resumeBuddies();
char recFileNameCStr[30]; m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

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

@ -53,9 +53,7 @@ RTLSDRInput::RTLSDRInput(DeviceSourceAPI *deviceAPI) :
{ {
openDevice(); openDevice();
char recFileNameCStr[30]; m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

4
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
View File

@ -63,9 +63,7 @@ SDRdaemonSourceInput::SDRdaemonSourceInput(DeviceSourceAPI *deviceAPI) :
m_sampleFifo.setSize(96000 * 4); m_sampleFifo.setSize(96000 * 4);
m_SDRdaemonUDPHandler = new SDRdaemonSourceUDPHandler(&m_sampleFifo, m_deviceAPI); m_SDRdaemonUDPHandler = new SDRdaemonSourceUDPHandler(&m_sampleFifo, m_deviceAPI);
char recFileNameCStr[30]; m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

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

@ -48,10 +48,7 @@ SDRPlayInput::SDRPlayInput(DeviceSourceAPI *deviceAPI) :
m_running(false) m_running(false)
{ {
openDevice(); openDevice();
m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
} }

4
plugins/samplesource/testsource/testsourceinput.cpp
View File

@ -41,9 +41,7 @@ TestSourceInput::TestSourceInput(DeviceSourceAPI *deviceAPI) :
m_running(false), m_running(false),
m_masterTimer(deviceAPI->getMasterTimer()) m_masterTimer(deviceAPI->getMasterTimer())
{ {
char recFileNameCStr[30]; m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
m_fileSink = new FileRecord(std::string(recFileNameCStr));
m_deviceAPI->addSink(m_fileSink); m_deviceAPI->addSink(m_fileSink);
if (!m_sampleFifo.setSize(96000 * 4)) { if (!m_sampleFifo.setSize(96000 * 4)) {

12
sdrbase/dsp/filerecord.cpp
View File

@ -7,7 +7,7 @@
FileRecord::FileRecord() : FileRecord::FileRecord() :
BasebandSampleSink(), BasebandSampleSink(),
m_fileName(std::string("test.sdriq")), m_fileName("test.sdriq"),
m_sampleRate(0), m_sampleRate(0),
m_centerFrequency(0), m_centerFrequency(0),
m_recordOn(false), m_recordOn(false),
@ -17,9 +17,9 @@ FileRecord::FileRecord() :
setObjectName("FileSink"); setObjectName("FileSink");
} }
FileRecord::FileRecord(const std::string& filename) : FileRecord::FileRecord(const QString& filename) :
BasebandSampleSink(), BasebandSampleSink(),
m_fileName(std::string(filename)), m_fileName(filename),
m_sampleRate(0), m_sampleRate(0),
m_centerFrequency(0), m_centerFrequency(0),
m_recordOn(false), m_recordOn(false),
@ -34,7 +34,7 @@ FileRecord::~FileRecord()
stopRecording(); stopRecording();
} }
void FileRecord::setFileName(const std::string& filename) void FileRecord::setFileName(const QString& filename)
{ {
if (!m_recordOn) if (!m_recordOn)
{ {
@ -75,7 +75,7 @@ void FileRecord::startRecording()
if (!m_sampleFile.is_open()) if (!m_sampleFile.is_open())
{ {
qDebug() << "FileRecord::startRecording"; qDebug() << "FileRecord::startRecording";
m_sampleFile.open(m_fileName.c_str(), std::ios::binary); m_sampleFile.open(m_fileName.toStdString().c_str(), std::ios::binary);
m_recordOn = true; m_recordOn = true;
m_recordStart = true; m_recordStart = true;
m_byteCount = 0; m_byteCount = 0;
@ -110,7 +110,7 @@ bool FileRecord::handleMessage(const Message& message)
} }
} }
void FileRecord::handleConfigure(const std::string& fileName) void FileRecord::handleConfigure(const QString& fileName)
{ {
if (fileName != m_fileName) if (fileName != m_fileName)
{ {

8
sdrbase/dsp/filerecord.h
View File

@ -23,12 +23,12 @@ public:
}; };
FileRecord(); FileRecord();
FileRecord(const std::string& filename); FileRecord(const QString& filename);
virtual ~FileRecord(); virtual ~FileRecord();
quint64 getByteCount() const { return m_byteCount; } quint64 getByteCount() const { return m_byteCount; }
void setFileName(const std::string& filename); void setFileName(const QString& filename);
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
virtual void start(); virtual void start();
@ -39,7 +39,7 @@ public:
static void readHeader(std::ifstream& samplefile, Header& header); static void readHeader(std::ifstream& samplefile, Header& header);
private: private:
std::string m_fileName; QString m_fileName;
qint32 m_sampleRate; qint32 m_sampleRate;
quint64 m_centerFrequency; quint64 m_centerFrequency;
bool m_recordOn; bool m_recordOn;
@ -47,7 +47,7 @@ private:
std::ofstream m_sampleFile; std::ofstream m_sampleFile;
quint64 m_byteCount; quint64 m_byteCount;
void handleConfigure(const std::string& fileName); void handleConfigure(const QString& fileName);
void writeHeader(); void writeHeader();
}; };