Browse Source

File record default file name fix (2)

chirpmodem-v8.0.0
f4exb 9 years ago
parent
commit
775b2a270d
  1. 4
      fcdlib/fcdtraits.cpp
  2. 13
      plugins/samplesource/airspy/airspyinput.cpp
  3. 2
      plugins/samplesource/airspy/airspyplugin.cpp
  4. 1
      plugins/samplesource/airspy/airspysettings.cpp
  5. 3
      plugins/samplesource/airspy/airspysettings.h
  6. 13
      plugins/samplesource/airspyhf/airspyhfinput.cpp
  7. 2
      plugins/samplesource/airspyhf/airspyhfplugin.cpp
  8. 1
      plugins/samplesource/airspyhf/airspyhfsettings.cpp
  9. 3
      plugins/samplesource/airspyhf/airspyhfsettings.h
  10. 13
      plugins/samplesource/bladerfinput/bladerfinput.cpp
  11. 2
      plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
  12. 1
      plugins/samplesource/bladerfinput/bladerfinputsettings.cpp
  13. 2
      plugins/samplesource/bladerfinput/bladerfinputsettings.h
  14. 13
      plugins/samplesource/fcdpro/fcdproinput.cpp
  15. 1
      plugins/samplesource/fcdpro/fcdprosettings.cpp
  16. 3
      plugins/samplesource/fcdpro/fcdprosettings.h
  17. 13
      plugins/samplesource/fcdproplus/fcdproplusinput.cpp
  18. 1
      plugins/samplesource/fcdproplus/fcdproplussettings.cpp
  19. 3
      plugins/samplesource/fcdproplus/fcdproplussettings.h
  20. 2
      plugins/samplesource/hackrfinput/hackrfinput.cpp
  21. 2
      plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
  22. 13
      plugins/samplesource/limesdrinput/limesdrinput.cpp
  23. 2
      plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
  24. 1
      plugins/samplesource/limesdrinput/limesdrinputsettings.cpp
  25. 2
      plugins/samplesource/limesdrinput/limesdrinputsettings.h
  26. 13
      plugins/samplesource/perseus/perseusinput.cpp
  27. 2
      plugins/samplesource/perseus/perseusplugin.cpp
  28. 1
      plugins/samplesource/perseus/perseussettings.cpp
  29. 2
      plugins/samplesource/perseus/perseussettings.h
  30. 13
      plugins/samplesource/plutosdrinput/plutosdrinput.cpp
  31. 2
      plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp
  32. 1
      plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp
  33. 3
      plugins/samplesource/plutosdrinput/plutosdrinputsettings.h
  34. 13
      plugins/samplesource/rtlsdr/rtlsdrinput.cpp
  35. 2
      plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
  36. 1
      plugins/samplesource/rtlsdr/rtlsdrsettings.cpp
  37. 3
      plugins/samplesource/rtlsdr/rtlsdrsettings.h
  38. 13
      plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
  39. 2
      plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp
  40. 1
      plugins/samplesource/sdrdaemonsource/sdrdaemonsourcesettings.cpp
  41. 1
      plugins/samplesource/sdrdaemonsource/sdrdaemonsourcesettings.h
  42. 13
      plugins/samplesource/sdrplay/sdrplayinput.cpp
  43. 2
      plugins/samplesource/sdrplay/sdrplayplugin.cpp
  44. 1
      plugins/samplesource/sdrplay/sdrplaysettings.cpp
  45. 2
      plugins/samplesource/sdrplay/sdrplaysettings.h
  46. 13
      plugins/samplesource/testsource/testsourceinput.cpp
  47. 2
      plugins/samplesource/testsource/testsourceplugin.cpp
  48. 1
      plugins/samplesource/testsource/testsourcesettings.cpp
  49. 3
      plugins/samplesource/testsource/testsourcesettings.h

4
fcdlib/fcdtraits.cpp

@ -22,8 +22,8 @@ const char *fcd_traits<ProPlus>::displayedName = "FunCube Dongle Pro+"; @@ -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;

13
plugins/samplesource/airspy/airspyinput.cpp

@ -303,9 +303,18 @@ bool AirspyInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/airspy/airspyplugin.cpp

@ -29,7 +29,7 @@ const int AirspyPlugin::m_maxDevices = 32; @@ -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,

1
plugins/samplesource/airspy/airspysettings.cpp

@ -40,6 +40,7 @@ void AirspySettings::resetToDefaults() @@ -40,6 +40,7 @@ void AirspySettings::resetToDefaults()
m_iqCorrection = false;
m_transverterMode = false;
m_transverterDeltaFrequency = 0;
m_fileRecordName = "";
}
QByteArray AirspySettings::serialize() const

3
plugins/samplesource/airspy/airspysettings.h

@ -17,6 +17,8 @@ @@ -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 { @@ -39,6 +41,7 @@ struct AirspySettings {
bool m_iqCorrection;
bool m_transverterMode;
qint64 m_transverterDeltaFrequency;
QString m_fileRecordName;
AirspySettings();
void resetToDefaults();

13
plugins/samplesource/airspyhf/airspyhfinput.cpp

@ -320,9 +320,18 @@ bool AirspyHFInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/airspyhf/airspyhfplugin.cpp

@ -30,7 +30,7 @@ @@ -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,

1
plugins/samplesource/airspyhf/airspyhfsettings.cpp

@ -33,6 +33,7 @@ void AirspyHFSettings::resetToDefaults() @@ -33,6 +33,7 @@ void AirspyHFSettings::resetToDefaults()
m_transverterMode = false;
m_transverterDeltaFrequency = 0;
m_bandIndex = 0;
m_fileRecordName = "";
}
QByteArray AirspyHFSettings::serialize() const

3
plugins/samplesource/airspyhf/airspyhfsettings.h

@ -17,6 +17,8 @@ @@ -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 @@ -26,6 +28,7 @@ struct AirspyHFSettings
bool m_transverterMode;
qint64 m_transverterDeltaFrequency;
quint32 m_bandIndex;
QString m_fileRecordName;
AirspyHFSettings();
void resetToDefaults();

13
plugins/samplesource/bladerfinput/bladerfinput.cpp

@ -275,9 +275,18 @@ bool BladerfInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp

@ -30,7 +30,7 @@ @@ -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,

1
plugins/samplesource/bladerfinput/bladerfinputsettings.cpp

@ -40,6 +40,7 @@ void BladeRFInputSettings::resetToDefaults() @@ -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

2
plugins/samplesource/bladerfinput/bladerfinputsettings.h

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#define _BLADERF_BLADERFINPUTSETTINGS_H_
#include <QtGlobal>
#include <QString>
#include <libbladeRF.h>
struct BladeRFInputSettings {
@ -40,6 +41,7 @@ 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();

13
plugins/samplesource/fcdpro/fcdproinput.cpp

@ -245,9 +245,18 @@ bool FCDProInput::handleMessage(const Message& message) @@ -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();
}

1
plugins/samplesource/fcdpro/fcdprosettings.cpp

@ -47,6 +47,7 @@ void FCDProSettings::resetToDefaults() @@ -47,6 +47,7 @@ void FCDProSettings::resetToDefaults()
m_gain6Index = 0;
m_transverterMode = false;
m_transverterDeltaFrequency = 0;
m_fileRecordName = "";
}
QByteArray FCDProSettings::serialize() const

3
plugins/samplesource/fcdpro/fcdprosettings.h

@ -17,6 +17,8 @@ @@ -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 { @@ -40,6 +42,7 @@ struct FCDProSettings {
bool m_iqCorrection;
bool m_transverterMode;
qint64 m_transverterDeltaFrequency;
QString m_fileRecordName;
FCDProSettings();
void resetToDefaults();

13
plugins/samplesource/fcdproplus/fcdproplusinput.cpp

@ -239,9 +239,18 @@ bool FCDProPlusInput::handleMessage(const Message& message) @@ -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();
}

1
plugins/samplesource/fcdproplus/fcdproplussettings.cpp

@ -38,6 +38,7 @@ void FCDProPlusSettings::resetToDefaults() @@ -38,6 +38,7 @@ void FCDProPlusSettings::resetToDefaults()
m_iqImbalance = false;
m_transverterMode = false;
m_transverterDeltaFrequency = 0;
m_fileRecordName = "";
}
QByteArray FCDProPlusSettings::serialize() const

3
plugins/samplesource/fcdproplus/fcdproplussettings.h

@ -17,6 +17,8 @@ @@ -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 { @@ -31,6 +33,7 @@ struct FCDProPlusSettings {
bool m_iqImbalance;
bool m_transverterMode;
qint64 m_transverterDeltaFrequency;
QString m_fileRecordName;
FCDProPlusSettings();
void resetToDefaults();

2
plugins/samplesource/hackrfinput/hackrfinput.cpp

@ -263,7 +263,7 @@ bool HackRFInput::handleMessage(const Message& message) @@ -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();

2
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp

@ -32,7 +32,7 @@ @@ -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,

13
plugins/samplesource/limesdrinput/limesdrinput.cpp

@ -687,9 +687,18 @@ bool LimeSDRInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/limesdrinput/limesdrinputplugin.cpp

@ -33,7 +33,7 @@ @@ -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,

1
plugins/samplesource/limesdrinput/limesdrinputsettings.cpp

@ -45,6 +45,7 @@ void LimeSDRInputSettings::resetToDefaults() @@ -45,6 +45,7 @@ void LimeSDRInputSettings::resetToDefaults()
m_extClockFreq = 10000000; // 10 MHz
m_transverterMode = false;
m_transverterDeltaFrequency = 0;
m_fileRecordName = "";
}
QByteArray LimeSDRInputSettings::serialize() const

2
plugins/samplesource/limesdrinput/limesdrinputsettings.h

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#define PLUGINS_SAMPLESOURCE_LIMESDRINPUT_LIMESDRINPUTSETTINGS_H_
#include <QByteArray>
#include <QString>
#include <stdint.h>
/**
@ -64,6 +65,7 @@ struct LimeSDRInputSettings @@ -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();

13
plugins/samplesource/perseus/perseusinput.cpp

@ -192,9 +192,18 @@ bool PerseusInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/perseus/perseusplugin.cpp

@ -27,7 +27,7 @@ @@ -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,

1
plugins/samplesource/perseus/perseussettings.cpp

@ -35,6 +35,7 @@ void PerseusSettings::resetToDefaults() @@ -35,6 +35,7 @@ void PerseusSettings::resetToDefaults()
m_adcPreamp = false;
m_wideBand = false;
m_attenuator = Attenuator_None;
m_fileRecordName = "";
}
QByteArray PerseusSettings::serialize() const

2
plugins/samplesource/perseus/perseussettings.h

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#define PLUGINS_SAMPLESOURCE_PERSEUS_PERSEUSSETTINGS_H_
#include <QtGlobal>
#include <QString>
struct PerseusSettings
{
@ -40,6 +41,7 @@ struct PerseusSettings @@ -40,6 +41,7 @@ struct PerseusSettings
bool m_adcPreamp;
bool m_wideBand;
Attenuator m_attenuator;
QString m_fileRecordName;
PerseusSettings();
void resetToDefaults();

13
plugins/samplesource/plutosdrinput/plutosdrinput.cpp

@ -190,9 +190,18 @@ bool PlutoSDRInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp

@ -28,7 +28,7 @@ class DeviceSourceAPI; @@ -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,

1
plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp

@ -44,6 +44,7 @@ void PlutoSDRInputSettings::resetToDefaults() @@ -44,6 +44,7 @@ void PlutoSDRInputSettings::resetToDefaults()
m_gainMode = GAIN_MANUAL;
m_transverterMode = false;
m_transverterDeltaFrequency = 0;
m_fileRecordName = "";
}
QByteArray PlutoSDRInputSettings::serialize() const

3
plugins/samplesource/plutosdrinput/plutosdrinputsettings.h

@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#define _PLUTOSDR_PLUTOSDRINPUTSETTINGS_H_
#include <QtGlobal>
#include <QString>
#include <stdint.h>
struct PlutoSDRInputSettings {
@ -73,7 +74,7 @@ struct PlutoSDRInputSettings { @@ -73,7 +74,7 @@ struct PlutoSDRInputSettings {
GainMode m_gainMode;
bool m_transverterMode;
qint64 m_transverterDeltaFrequency;
QString m_fileRecordName;
PlutoSDRInputSettings();
void resetToDefaults();

13
plugins/samplesource/rtlsdr/rtlsdrinput.cpp

@ -304,9 +304,18 @@ bool RTLSDRInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp

@ -14,7 +14,7 @@ @@ -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,

1
plugins/samplesource/rtlsdr/rtlsdrsettings.cpp

@ -39,6 +39,7 @@ void RTLSDRSettings::resetToDefaults() @@ -39,6 +39,7 @@ void RTLSDRSettings::resetToDefaults()
m_transverterMode = false;
m_transverterDeltaFrequency = 0;
m_rfBandwidth = 2500 * 1000; // Hz
m_fileRecordName = "";
}
QByteArray RTLSDRSettings::serialize() const

3
plugins/samplesource/rtlsdr/rtlsdrsettings.h

@ -17,6 +17,8 @@ @@ -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 { @@ -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();

13
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp

@ -185,9 +185,18 @@ bool SDRdaemonSourceInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp

@ -26,7 +26,7 @@ @@ -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,

1
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcesettings.cpp

@ -36,6 +36,7 @@ void SDRdaemonSourceSettings::resetToDefaults() @@ -36,6 +36,7 @@ void SDRdaemonSourceSettings::resetToDefaults()
m_dcBlock = false;
m_iqCorrection = false;
m_fcPos = 2; // center
m_fileRecordName = "";
}
QByteArray SDRdaemonSourceSettings::serialize() const

1
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcesettings.h

@ -33,6 +33,7 @@ struct SDRdaemonSourceSettings { @@ -33,6 +33,7 @@ struct SDRdaemonSourceSettings {
bool m_dcBlock;
bool m_iqCorrection;
quint32 m_fcPos;
QString m_fileRecordName;
SDRdaemonSourceSettings();
void resetToDefaults();

13
plugins/samplesource/sdrplay/sdrplayinput.cpp

@ -299,9 +299,18 @@ bool SDRPlayInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/sdrplay/sdrplayplugin.cpp

@ -25,7 +25,7 @@ @@ -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,

1
plugins/samplesource/sdrplay/sdrplaysettings.cpp

@ -41,6 +41,7 @@ void SDRPlaySettings::resetToDefaults() @@ -41,6 +41,7 @@ void SDRPlaySettings::resetToDefaults()
m_lnaOn = false;
m_mixerAmpOn = false;
m_basebandGain = 29;
m_fileRecordName = "";
}
QByteArray SDRPlaySettings::serialize() const

2
plugins/samplesource/sdrplay/sdrplaysettings.h

@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#include <stdint.h>
#include <QByteArray>
#include <QString>
#include <QDebug>
struct SDRPlaySettings {
@ -43,6 +44,7 @@ struct SDRPlaySettings { @@ -43,6 +44,7 @@ struct SDRPlaySettings {
bool m_lnaOn;
bool m_mixerAmpOn;
int m_basebandGain;
QString m_fileRecordName;
SDRPlaySettings();
void resetToDefaults();

13
plugins/samplesource/testsource/testsourceinput.cpp

@ -177,9 +177,18 @@ bool TestSourceInput::handleMessage(const Message& message) @@ -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();
}

2
plugins/samplesource/testsource/testsourceplugin.cpp

@ -29,7 +29,7 @@ @@ -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,

1
plugins/samplesource/testsource/testsourcesettings.cpp

@ -41,6 +41,7 @@ void TestSourceSettings::resetToDefaults() @@ -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

3
plugins/samplesource/testsource/testsourcesettings.h

@ -17,6 +17,8 @@ @@ -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 { @@ -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…
Cancel
Save