mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-22 17:45:48 -05:00
File record default file name fix (2)
This commit is contained in:
parent
2d57d6d7e0
commit
775b2a270d
@ -22,8 +22,8 @@ const char *fcd_traits<ProPlus>::displayedName = "FunCube Dongle Pro+";
|
||||
const char *fcd_traits<Pro>::pluginDisplayedName = "FunCube Pro Input";
|
||||
const char *fcd_traits<ProPlus>::pluginDisplayedName = "FunCube Pro+ Input";
|
||||
|
||||
const char *fcd_traits<Pro>::pluginVersion = "3.14.5";
|
||||
const char *fcd_traits<ProPlus>::pluginVersion = "3.14.5";
|
||||
const char *fcd_traits<Pro>::pluginVersion = "3.14.6";
|
||||
const char *fcd_traits<ProPlus>::pluginVersion = "3.14.6";
|
||||
|
||||
const int64_t fcd_traits<Pro>::loLowLimitFreq = 64000000L;
|
||||
const int64_t fcd_traits<ProPlus>::loLowLimitFreq = 150000L;
|
||||
|
@ -303,9 +303,18 @@ bool AirspyInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "AirspyInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@ const int AirspyPlugin::m_maxDevices = 32;
|
||||
|
||||
const PluginDescriptor AirspyPlugin::m_pluginDescriptor = {
|
||||
QString("Airspy Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -40,6 +40,7 @@ void AirspySettings::resetToDefaults()
|
||||
m_iqCorrection = false;
|
||||
m_transverterMode = false;
|
||||
m_transverterDeltaFrequency = 0;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray AirspySettings::serialize() const
|
||||
|
@ -17,6 +17,8 @@
|
||||
#ifndef _AIRSPY_AIRSPYSETTINGS_H_
|
||||
#define _AIRSPY_AIRSPYSETTINGS_H_
|
||||
|
||||
#include <QString>
|
||||
|
||||
struct AirspySettings {
|
||||
typedef enum {
|
||||
FC_POS_INFRA = 0,
|
||||
@ -39,6 +41,7 @@ struct AirspySettings {
|
||||
bool m_iqCorrection;
|
||||
bool m_transverterMode;
|
||||
qint64 m_transverterDeltaFrequency;
|
||||
QString m_fileRecordName;
|
||||
|
||||
AirspySettings();
|
||||
void resetToDefaults();
|
||||
|
@ -320,9 +320,18 @@ bool AirspyHFInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "AirspyHFInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
const PluginDescriptor AirspyHFPlugin::m_pluginDescriptor = {
|
||||
QString("AirspyHF Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -33,6 +33,7 @@ void AirspyHFSettings::resetToDefaults()
|
||||
m_transverterMode = false;
|
||||
m_transverterDeltaFrequency = 0;
|
||||
m_bandIndex = 0;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray AirspyHFSettings::serialize() const
|
||||
|
@ -17,6 +17,8 @@
|
||||
#ifndef _AIRSPYHFF_AIRSPYHFSETTINGS_H_
|
||||
#define _AIRSPYHFF_AIRSPYHFSETTINGS_H_
|
||||
|
||||
#include <QString>
|
||||
|
||||
struct AirspyHFSettings
|
||||
{
|
||||
quint64 m_centerFrequency;
|
||||
@ -26,6 +28,7 @@ struct AirspyHFSettings
|
||||
bool m_transverterMode;
|
||||
qint64 m_transverterDeltaFrequency;
|
||||
quint32 m_bandIndex;
|
||||
QString m_fileRecordName;
|
||||
|
||||
AirspyHFSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -275,9 +275,18 @@ bool BladerfInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "BladerfInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = {
|
||||
QString("BladeRF Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -40,6 +40,7 @@ void BladeRFInputSettings::resetToDefaults()
|
||||
m_xb200Filter = BLADERF_XB200_AUTO_1DB;
|
||||
m_dcBlock = false;
|
||||
m_iqCorrection = false;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray BladeRFInputSettings::serialize() const
|
||||
|
@ -18,6 +18,7 @@
|
||||
#define _BLADERF_BLADERFINPUTSETTINGS_H_
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QString>
|
||||
#include <libbladeRF.h>
|
||||
|
||||
struct BladeRFInputSettings {
|
||||
@ -40,6 +41,7 @@ struct BladeRFInputSettings {
|
||||
bladerf_xb200_filter m_xb200Filter;
|
||||
bool m_dcBlock;
|
||||
bool m_iqCorrection;
|
||||
QString m_fileRecordName;
|
||||
|
||||
BladeRFInputSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -245,9 +245,18 @@ bool FCDProInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "FCDProInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -47,6 +47,7 @@ void FCDProSettings::resetToDefaults()
|
||||
m_gain6Index = 0;
|
||||
m_transverterMode = false;
|
||||
m_transverterDeltaFrequency = 0;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray FCDProSettings::serialize() const
|
||||
|
@ -17,6 +17,8 @@
|
||||
#ifndef _FCDPRO_FCDPROSETTINGS_H_
|
||||
#define _FCDPRO_FCDPROSETTINGS_H_
|
||||
|
||||
#include <QString>
|
||||
|
||||
struct FCDProSettings {
|
||||
quint64 m_centerFrequency;
|
||||
qint32 m_LOppmTenths;
|
||||
@ -40,6 +42,7 @@ struct FCDProSettings {
|
||||
bool m_iqCorrection;
|
||||
bool m_transverterMode;
|
||||
qint64 m_transverterDeltaFrequency;
|
||||
QString m_fileRecordName;
|
||||
|
||||
FCDProSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -239,9 +239,18 @@ bool FCDProPlusInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "FCDProPlusInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -38,6 +38,7 @@ void FCDProPlusSettings::resetToDefaults()
|
||||
m_iqImbalance = false;
|
||||
m_transverterMode = false;
|
||||
m_transverterDeltaFrequency = 0;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray FCDProPlusSettings::serialize() const
|
||||
|
@ -17,6 +17,8 @@
|
||||
#ifndef _FCDPROPLUS_FCDPROPLUSSETTINGS_H_
|
||||
#define _FCDPROPLUS_FCDPROPLUSSETTINGS_H_
|
||||
|
||||
#include <QString>
|
||||
|
||||
struct FCDProPlusSettings {
|
||||
quint64 m_centerFrequency;
|
||||
bool m_rangeLow;
|
||||
@ -31,6 +33,7 @@ struct FCDProPlusSettings {
|
||||
bool m_iqImbalance;
|
||||
bool m_transverterMode;
|
||||
qint64 m_transverterDeltaFrequency;
|
||||
QString m_fileRecordName;
|
||||
|
||||
FCDProPlusSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -263,7 +263,7 @@ bool HackRFInput::handleMessage(const Message& message)
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} else {
|
||||
m_fileSink->setFileName(QString("rec_%1_%2.sdriq").arg(m_deviceAPI->getDeviceUID()).arg(QDateTime::currentDateTimeUtc().toString("yyyy-MM-ddThh:mm:ss")));
|
||||
m_fileSink->setFileName(QString("rec%1_%2.sdriq").arg(m_deviceAPI->getDeviceUID()).arg(QDateTime::currentDateTimeUtc().toString("yyyy-MM-ddThh:mm:ss")));
|
||||
}
|
||||
|
||||
m_fileSink->startRecording();
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = {
|
||||
QString("HackRF Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -687,9 +687,18 @@ bool LimeSDRInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "LimeSDRInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
||||
|
||||
const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = {
|
||||
QString("LimeSDR Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -45,6 +45,7 @@ void LimeSDRInputSettings::resetToDefaults()
|
||||
m_extClockFreq = 10000000; // 10 MHz
|
||||
m_transverterMode = false;
|
||||
m_transverterDeltaFrequency = 0;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray LimeSDRInputSettings::serialize() const
|
||||
|
@ -18,6 +18,7 @@
|
||||
#define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QString>
|
||||
#include <stdint.h>
|
||||
|
||||
/**
|
||||
@ -64,6 +65,7 @@ struct LimeSDRInputSettings
|
||||
uint32_t m_extClockFreq; //!< Frequency (Hz) of external clock source
|
||||
bool m_transverterMode;
|
||||
qint64 m_transverterDeltaFrequency;
|
||||
QString m_fileRecordName;
|
||||
|
||||
LimeSDRInputSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -192,9 +192,18 @@ bool PerseusInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "PerseusInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
const PluginDescriptor PerseusPlugin::m_pluginDescriptor = {
|
||||
QString("Perseus Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -35,6 +35,7 @@ void PerseusSettings::resetToDefaults()
|
||||
m_adcPreamp = false;
|
||||
m_wideBand = false;
|
||||
m_attenuator = Attenuator_None;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray PerseusSettings::serialize() const
|
||||
|
@ -18,6 +18,7 @@
|
||||
#define PLUGINS_SAMPLESOURCE_PERSEUS_PERSEUSSETTINGS_H_
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QString>
|
||||
|
||||
struct PerseusSettings
|
||||
{
|
||||
@ -40,6 +41,7 @@ struct PerseusSettings
|
||||
bool m_adcPreamp;
|
||||
bool m_wideBand;
|
||||
Attenuator m_attenuator;
|
||||
QString m_fileRecordName;
|
||||
|
||||
PerseusSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -190,9 +190,18 @@ bool PlutoSDRInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "PlutoSDRInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -28,7 +28,7 @@ class DeviceSourceAPI;
|
||||
|
||||
const PluginDescriptor PlutoSDRInputPlugin::m_pluginDescriptor = {
|
||||
QString("PlutoSDR Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -44,6 +44,7 @@ void PlutoSDRInputSettings::resetToDefaults()
|
||||
m_gainMode = GAIN_MANUAL;
|
||||
m_transverterMode = false;
|
||||
m_transverterDeltaFrequency = 0;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray PlutoSDRInputSettings::serialize() const
|
||||
|
@ -18,6 +18,7 @@
|
||||
#define _PLUTOSDR_PLUTOSDRINPUTSETTINGS_H_
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QString>
|
||||
#include <stdint.h>
|
||||
|
||||
struct PlutoSDRInputSettings {
|
||||
@ -73,7 +74,7 @@ struct PlutoSDRInputSettings {
|
||||
GainMode m_gainMode;
|
||||
bool m_transverterMode;
|
||||
qint64 m_transverterDeltaFrequency;
|
||||
|
||||
QString m_fileRecordName;
|
||||
|
||||
PlutoSDRInputSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -304,9 +304,18 @@ bool RTLSDRInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "RTLSDRInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
|
||||
QString("RTL-SDR Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -39,6 +39,7 @@ void RTLSDRSettings::resetToDefaults()
|
||||
m_transverterMode = false;
|
||||
m_transverterDeltaFrequency = 0;
|
||||
m_rfBandwidth = 2500 * 1000; // Hz
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray RTLSDRSettings::serialize() const
|
||||
|
@ -17,6 +17,8 @@
|
||||
#ifndef _RTLSDR_RTLSDRSETTINGS_H_
|
||||
#define _RTLSDR_RTLSDRSETTINGS_H_
|
||||
|
||||
#include <QString>
|
||||
|
||||
struct RTLSDRSettings {
|
||||
typedef enum {
|
||||
FC_POS_INFRA = 0,
|
||||
@ -38,6 +40,7 @@ struct RTLSDRSettings {
|
||||
bool m_transverterMode;
|
||||
qint64 m_transverterDeltaFrequency;
|
||||
quint32 m_rfBandwidth; //!< RF filter bandwidth in Hz
|
||||
QString m_fileRecordName;
|
||||
|
||||
RTLSDRSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -185,9 +185,18 @@ bool SDRdaemonSourceInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "SDRdaemonSourceInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
const PluginDescriptor SDRdaemonSourcePlugin::m_pluginDescriptor = {
|
||||
QString("SDRdaemon source input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -36,6 +36,7 @@ void SDRdaemonSourceSettings::resetToDefaults()
|
||||
m_dcBlock = false;
|
||||
m_iqCorrection = false;
|
||||
m_fcPos = 2; // center
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray SDRdaemonSourceSettings::serialize() const
|
||||
|
@ -33,6 +33,7 @@ struct SDRdaemonSourceSettings {
|
||||
bool m_dcBlock;
|
||||
bool m_iqCorrection;
|
||||
quint32 m_fcPos;
|
||||
QString m_fileRecordName;
|
||||
|
||||
SDRdaemonSourceSettings();
|
||||
void resetToDefaults();
|
||||
|
@ -299,9 +299,18 @@ bool SDRPlayInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "SDRPlayInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
const PluginDescriptor SDRPlayPlugin::m_pluginDescriptor = {
|
||||
QString("SDRPlay RSP1 Input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -41,6 +41,7 @@ void SDRPlaySettings::resetToDefaults()
|
||||
m_lnaOn = false;
|
||||
m_mixerAmpOn = false;
|
||||
m_basebandGain = 29;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray SDRPlaySettings::serialize() const
|
||||
|
@ -19,6 +19,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <QByteArray>
|
||||
#include <QString>
|
||||
#include <QDebug>
|
||||
|
||||
struct SDRPlaySettings {
|
||||
@ -43,6 +44,7 @@ struct SDRPlaySettings {
|
||||
bool m_lnaOn;
|
||||
bool m_mixerAmpOn;
|
||||
int m_basebandGain;
|
||||
QString m_fileRecordName;
|
||||
|
||||
SDRPlaySettings();
|
||||
void resetToDefaults();
|
||||
|
@ -177,9 +177,18 @@ bool TestSourceInput::handleMessage(const Message& message)
|
||||
MsgFileRecord& conf = (MsgFileRecord&) message;
|
||||
qDebug() << "RTLSDRInput::handleMessage: MsgFileRecord: " << conf.getStartStop();
|
||||
|
||||
if (conf.getStartStop()) {
|
||||
if (conf.getStartStop())
|
||||
{
|
||||
if (m_settings.m_fileRecordName.size() != 0) {
|
||||
m_fileSink->setFileName(m_settings.m_fileRecordName);
|
||||
} 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 {
|
||||
}
|
||||
else
|
||||
{
|
||||
m_fileSink->stopRecording();
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@
|
||||
|
||||
const PluginDescriptor TestSourcePlugin::m_pluginDescriptor = {
|
||||
QString("Test Source input"),
|
||||
QString("3.14.5"),
|
||||
QString("3.14.6"),
|
||||
QString("(c) Edouard Griffiths, F4EXB"),
|
||||
QString("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
@ -41,6 +41,7 @@ void TestSourceSettings::resetToDefaults()
|
||||
m_iFactor = 0.0f;
|
||||
m_qFactor = 0.0f;
|
||||
m_phaseImbalance = 0.0f;
|
||||
m_fileRecordName = "";
|
||||
}
|
||||
|
||||
QByteArray TestSourceSettings::serialize() const
|
||||
|
@ -17,6 +17,8 @@
|
||||
#ifndef _TESTSOURCE_TESTSOURCESETTINGS_H_
|
||||
#define _TESTSOURCE_TESTSOURCESETTINGS_H_
|
||||
|
||||
#include <QString>
|
||||
|
||||
struct TestSourceSettings {
|
||||
typedef enum {
|
||||
FC_POS_INFRA = 0,
|
||||
@ -54,6 +56,7 @@ struct TestSourceSettings {
|
||||
float m_iFactor; //!< -1.0 < x < 1.0
|
||||
float m_qFactor; //!< -1.0 < x < 1.0
|
||||
float m_phaseImbalance; //!< -1.0 < x < 1.0
|
||||
QString m_fileRecordName;
|
||||
|
||||
TestSourceSettings();
|
||||
void resetToDefaults();
|
||||
|
Loading…
Reference in New Issue
Block a user