VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-23 18:52:28 -04:00
Code Issues Projects Releases Wiki Activity

Clang clean compile

Browse Source
This commit is contained in:
f4exb 2018-03-04 01:47:51 +01:00
parent 98fc93a26b
commit 28e9df5fe8
66 changed files with 184 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/plutosdr/deviceplutosdrparams.h
View File

@ -30,7 +30,7 @@ class DEVICES_API DevicePlutoSDRBox;
* There is only one copy that is constructed by the first participant and destroyed by the last. * There is only one copy that is constructed by the first participant and destroyed by the last.
* A participant knows it is the first or last by checking the lists of buddies (Rx + Tx). * A participant knows it is the first or last by checking the lists of buddies (Rx + Tx).
*/ */
struct DevicePlutoSDRParams class DevicePlutoSDRParams
{ {
public: public:
DevicePlutoSDRParams(); DevicePlutoSDRParams();

4
plugins/channelrx/demodbfm/CMakeLists.txt
View File

@ -22,7 +22,9 @@ set(bfm_HEADERS
rdstmc.h rdstmc.h
) )
set_source_files_properties(rdstmc.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set_source_files_properties(rdstmc.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
endif()
set(bfm_FORMS set(bfm_FORMS
bfmdemodgui.ui bfmdemodgui.ui

2
plugins/channelrx/demoddatv/leansdr/generic.h
View File

@ -329,7 +329,7 @@ private:
template<typename Tin, typename Tout> template<typename Tin, typename Tout>
struct serializer: runnable struct serializer: runnable
{ {
serializer(scheduler *sch, pipebuf<Tin> &_in, pipebuf<Tout> &_out) : serializer(scheduler *sch __attribute__((unused)), pipebuf<Tin> &_in, pipebuf<Tout> &_out) :
nin(max((size_t) 1, sizeof(Tin) / sizeof(Tout))), nout(max((size_t) 1, sizeof(Tout) / sizeof(Tin))), in(_in), out(_out, nout) nin(max((size_t) 1, sizeof(Tin) / sizeof(Tout))), nout(max((size_t) 1, sizeof(Tout) / sizeof(Tin))), in(_in), out(_out, nout)
{ {
if (nin * sizeof(Tin) != nout * sizeof(Tout)) if (nin * sizeof(Tin) != nout * sizeof(Tout))

1
plugins/channelrx/demoddatv/leansdr/sdr.h
View File

@ -325,7 +325,6 @@ private:
float gain = estimated ? out_rms / sqrtf(estimated) : 0; float gain = estimated ? out_rms / sqrtf(estimated) : 0;
pin = in.rd(); pin = in.rd();
complex<T> *pout = out.wr(); complex<T> *pout = out.wr();
float bwcomp = 1 - bw;
for (; pin < pend; ++pin, ++pout) for (; pin < pend; ++pin, ++pout)
{ {
pout->re = pin->re * gain; pout->re = pin->re * gain;

1
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -50,7 +50,6 @@ DSDDemod::DSDDemod(DeviceSourceAPI *deviceAPI) :
m_squelchGate(0), m_squelchGate(0),
m_squelchLevel(1e-4), m_squelchLevel(1e-4),
m_squelchOpen(false), m_squelchOpen(false),
m_fmExcursion(24),
m_audioFifo1(48000), m_audioFifo1(48000),
m_audioFifo2(48000), m_audioFifo2(48000),
m_scope(0), m_scope(0),

2
plugins/channelrx/demoddsd/dsddemod.h
View File

@ -181,8 +181,6 @@ private:
double m_magsqPeak; double m_magsqPeak;
int m_magsqCount; int m_magsqCount;
Real m_fmExcursion;
SampleVector m_scopeSampleBuffer; SampleVector m_scopeSampleBuffer;
AudioVector m_audioBuffer; AudioVector m_audioBuffer;
uint m_audioBufferFill; uint m_audioBufferFill;

2
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -55,7 +55,6 @@ NFMDemod::NFMDemod(DeviceSourceAPI *devieAPI) :
m_sampleCount(0), m_sampleCount(0),
m_squelchCount(0), m_squelchCount(0),
m_squelchGate(2), m_squelchGate(2),
m_audioMute(false),
m_squelchLevel(-990), m_squelchLevel(-990),
m_squelchOpen(false), m_squelchOpen(false),
m_afSquelchOpen(false), m_afSquelchOpen(false),
@ -64,7 +63,6 @@ NFMDemod::NFMDemod(DeviceSourceAPI *devieAPI) :
m_magsqPeak(0.0f), m_magsqPeak(0.0f),
m_magsqCount(0), m_magsqCount(0),
m_afSquelch(2, afSqTones), m_afSquelch(2, afSqTones),
m_fmExcursion(2400),
m_audioFifo(48000), m_audioFifo(48000),
m_settingsMutex(QMutex::Recursive) m_settingsMutex(QMutex::Recursive)
{ {

8
plugins/channelrx/demodnfm/nfmdemod.h
View File

@ -191,7 +191,6 @@ private:
int m_sampleCount; int m_sampleCount;
int m_squelchCount; int m_squelchCount;
int m_squelchGate; int m_squelchGate;
bool m_audioMute;
Real m_squelchLevel; Real m_squelchLevel;
bool m_squelchOpen; bool m_squelchOpen;
@ -201,16 +200,9 @@ private:
double m_magsqPeak; double m_magsqPeak;
int m_magsqCount; int m_magsqCount;
Real m_lastArgument;
//Complex m_m1Sample;
//Complex m_m2Sample;
MovingAverageUtil<Real, double, 32> m_movingAverage; MovingAverageUtil<Real, double, 32> m_movingAverage;
AFSquelch m_afSquelch; AFSquelch m_afSquelch;
Real m_agcLevel; // AGC will aim to this level Real m_agcLevel; // AGC will aim to this level
Real m_agcFloor; // AGC will not go below this level
Real m_fmExcursion;
//Real m_fmScaling;
AudioVector m_audioBuffer; AudioVector m_audioBuffer;
uint m_audioBufferFill; uint m_audioBufferFill;

1
plugins/channelrx/demodwfm/wfmdemod.h
View File

@ -149,7 +149,6 @@ private:
double m_magsqPeak; double m_magsqPeak;
int m_magsqCount; int m_magsqCount;
Real m_lastArgument;
MovingAverageUtil<Real, double, 16> m_movingAverage; MovingAverageUtil<Real, double, 16> m_movingAverage;
Real m_fmExcursion; Real m_fmExcursion;

2
plugins/channelrx/tcpsrc/tcpsrcsettings.h
View File

@ -21,7 +21,7 @@
#include <QString> #include <QString>
#include <stdint.h> #include <stdint.h>
struct Serializable; class Serializable;
struct TCPSrcSettings struct TCPSrcSettings
{ {

2
plugins/channelrx/udpsrc/udpsrcsettings.h
View File

@ -21,7 +21,7 @@
#include <QString> #include <QString>
#include <stdint.h> #include <stdint.h>
struct Serializable; class Serializable;
struct UDPSrcSettings struct UDPSrcSettings
{ {

2
plugins/channeltx/modatv/atvmodsettings.h
View File

@ -21,7 +21,7 @@
#include <QString> #include <QString>
#include <stdint.h> #include <stdint.h>
struct Serializable; class Serializable;
struct ATVModSettings struct ATVModSettings
{ {

10
plugins/channeltx/modnfm/nfmmod.cpp
View File

@ -179,10 +179,10 @@ void NFMMod::pullAF(Real& sample)
{ {
switch (m_settings.m_modAFInput) switch (m_settings.m_modAFInput)
{ {
case NFMModInputTone: case NFMModSettings::NFMModInputTone:
sample = m_toneNco.next(); sample = m_toneNco.next();
break; break;
case NFMModInputFile: case NFMModSettings::NFMModInputFile:
// sox f4exb_call.wav --encoding float --endian little f4exb_call.raw // sox f4exb_call.wav --encoding float --endian little f4exb_call.raw
// ffplay -f f32le -ar 48k -ac 1 f4exb_call.raw // ffplay -f f32le -ar 48k -ac 1 f4exb_call.raw
if (m_ifstream.is_open()) if (m_ifstream.is_open())
@ -211,10 +211,10 @@ void NFMMod::pullAF(Real& sample)
sample = 0.0f; sample = 0.0f;
} }
break; break;
case NFMModInputAudio: case NFMModSettings::NFMModInputAudio:
sample = ((m_audioBuffer[m_audioBufferFill].l + m_audioBuffer[m_audioBufferFill].r) / 65536.0f) * m_settings.m_volumeFactor; sample = ((m_audioBuffer[m_audioBufferFill].l + m_audioBuffer[m_audioBufferFill].r) / 65536.0f) * m_settings.m_volumeFactor;
break; break;
case NFMModInputCWTone: case NFMModSettings::NFMModInputCWTone:
Real fadeFactor; Real fadeFactor;
if (m_cwKeyer.getSample()) if (m_cwKeyer.getSample())
@ -235,7 +235,7 @@ void NFMMod::pullAF(Real& sample)
} }
} }
break; break;
case NFMModInputNone: case NFMModSettings::NFMModInputNone:
default: default:
sample = 0.0f; sample = 0.0f;
break; break;

11
plugins/channeltx/modnfm/nfmmod.h
View File

@ -91,15 +91,6 @@ public:
{ } { }
}; };
typedef enum
{
NFMModInputNone,
NFMModInputTone,
NFMModInputFile,
NFMModInputAudio,
NFMModInputCWTone
} NFMModInputAF;
class MsgConfigureFileSourceName : public Message class MsgConfigureFileSourceName : public Message
{ {
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
@ -296,7 +287,7 @@ private:
quint32 m_recordLength; //!< record length in seconds computed from file size quint32 m_recordLength; //!< record length in seconds computed from file size
int m_sampleRate; int m_sampleRate;
NFMModInputAF m_afInput; NFMModSettings::NFMModInputAF m_afInput;
quint32 m_levelCalcCount; quint32 m_levelCalcCount;
Real m_peakLevel; Real m_peakLevel;
Real m_levelSum; Real m_levelSum;

2
plugins/channeltx/modnfm/nfmmodgui.h
View File

@ -72,7 +72,7 @@ private:
int m_samplesCount; int m_samplesCount;
std::size_t m_tickCount; std::size_t m_tickCount;
bool m_enableNavTime; bool m_enableNavTime;
NFMMod::NFMModInputAF m_modAFInput; NFMModSettings::NFMModInputAF m_modAFInput;
MessageQueue m_inputMessageQueue; MessageQueue m_inputMessageQueue;
explicit NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent = 0); explicit NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent = 0);

2
plugins/channeltx/modssb/ssbmodsettings.h
View File

@ -21,7 +21,7 @@
#include <QString> #include <QString>
#include <stdint.h> #include <stdint.h>
struct Serializable; class Serializable;
struct SSBModSettings struct SSBModSettings
{ {

2
plugins/channeltx/udpsink/udpsinkgui.cpp
View File

@ -255,7 +255,7 @@ void UDPSinkGUI::on_deltaFrequency_changed(qint64 value)
void UDPSinkGUI::on_sampleFormat_currentIndexChanged(int index) void UDPSinkGUI::on_sampleFormat_currentIndexChanged(int index)
{ {
if ((index == (int) UDPSinkSettings::FormatNFM)) { if (index == (int) UDPSinkSettings::FormatNFM) {
ui->fmDeviation->setEnabled(true); ui->fmDeviation->setEnabled(true);
} else { } else {
ui->fmDeviation->setEnabled(false); ui->fmDeviation->setEnabled(false);

2
plugins/channeltx/udpsink/udpsinksettings.h
View File

@ -21,7 +21,7 @@
#include <QString> #include <QString>
#include <stdint.h> #include <stdint.h>
struct Serializable; class Serializable;
struct UDPSinkSettings struct UDPSinkSettings
{ {

3
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp
View File

@ -28,7 +28,7 @@
const int SDRdaemonSourceBuffer::m_sampleSize = 2; const int SDRdaemonSourceBuffer::m_sampleSize = 2;
const int SDRdaemonSourceBuffer::m_iqSampleSize = 2 * m_sampleSize; const int SDRdaemonSourceBuffer::m_iqSampleSize = 2 * m_sampleSize;
SDRdaemonSourceBuffer::SDRdaemonSourceBuffer(uint32_t throttlems) : SDRdaemonSourceBuffer::SDRdaemonSourceBuffer() :
m_decoderIndexHead(nbDecoderSlots/2), m_decoderIndexHead(nbDecoderSlots/2),
m_frameHead(0), m_frameHead(0),
m_curNbBlocks(0), m_curNbBlocks(0),
@ -39,7 +39,6 @@ SDRdaemonSourceBuffer::SDRdaemonSourceBuffer(uint32_t throttlems) :
m_maxNbRecovery(0), m_maxNbRecovery(0),
m_framesDecoded(true), m_framesDecoded(true),
m_readIndex(0), m_readIndex(0),
m_throttlemsNominal(throttlems),
m_readBuffer(0), m_readBuffer(0),
m_readSize(0), m_readSize(0),
m_bufferLenSec(0.0f), m_bufferLenSec(0.0f),

3
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.h
View File

@ -83,7 +83,7 @@ public:
}; };
#pragma pack(pop) #pragma pack(pop)
SDRdaemonSourceBuffer(uint32_t throttlems); SDRdaemonSourceBuffer();
~SDRdaemonSourceBuffer(); ~SDRdaemonSourceBuffer();
// R/W operations // R/W operations
@ -207,7 +207,6 @@ private:
uint32_t m_tvOut_usec; //!< Estimated returned samples timestamp (microseconds) uint32_t m_tvOut_usec; //!< Estimated returned samples timestamp (microseconds)
int m_readNbBytes; //!< Nominal number of bytes per read (50ms) int m_readNbBytes; //!< Nominal number of bytes per read (50ms)
uint32_t m_throttlemsNominal; //!< Initial throttle in ms
uint8_t* m_readBuffer; //!< Read buffer to hold samples when looping back to beginning of raw buffer uint8_t* m_readBuffer; //!< Read buffer to hold samples when looping back to beginning of raw buffer
int m_readSize; //!< Read buffer size int m_readSize; //!< Read buffer size

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

@ -52,9 +52,7 @@ SDRdaemonSourceInput::SDRdaemonSourceInput(DeviceSourceAPI *deviceAPI) :
m_settings(), m_settings(),
m_SDRdaemonUDPHandler(0), m_SDRdaemonUDPHandler(0),
m_deviceDescription(), m_deviceDescription(),
m_startingTimeStamp(0), m_startingTimeStamp(0)
m_autoFollowRate(false),
m_autoCorrBuffer(false)
{ {
m_sender = nn_socket(AF_SP, NN_PAIR); m_sender = nn_socket(AF_SP, NN_PAIR);
assert(m_sender != -1); assert(m_sender != -1);

2
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h
View File

@ -297,8 +297,6 @@ private:
int m_sender; int m_sender;
QString m_deviceDescription; QString m_deviceDescription;
std::time_t m_startingTimeStamp; std::time_t m_startingTimeStamp;
bool m_autoFollowRate;
bool m_autoCorrBuffer;
FileRecord *m_fileSink; //!< File sink to record device I/Q output FileRecord *m_fileSink; //!< File sink to record device I/Q output
void applySettings(const SDRdaemonSourceSettings& settings, bool force = false); void applySettings(const SDRdaemonSourceSettings& settings, bool force = false);

1
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp
View File

@ -32,7 +32,6 @@ SDRdaemonSourceUDPHandler::SDRdaemonSourceUDPHandler(SampleSinkFifo *sampleFifo,
m_masterTimerConnected(false), m_masterTimerConnected(false),
m_running(false), m_running(false),
m_rateDivider(1000/SDRDAEMONSOURCE_THROTTLE_MS), m_rateDivider(1000/SDRDAEMONSOURCE_THROTTLE_MS),
m_sdrDaemonBuffer(m_rateDivider),
m_dataSocket(0), m_dataSocket(0),
m_dataAddress(QHostAddress::LocalHost), m_dataAddress(QHostAddress::LocalHost),
m_remoteAddress(QHostAddress::LocalHost), m_remoteAddress(QHostAddress::LocalHost),

2
sdrbase/resources/webapi/doc/html2/index.html
View File

@ -16925,7 +16925,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2018-02-20T20:02:08.315+01:00 Generated 2018-03-03T23:35:13.013+01:00
</div> </div>
</div> </div>
</div> </div>

14
sdrbase/util/bitfieldindex.h
View File

@ -45,9 +45,19 @@ struct BitfieldIndex
}; };
template <unsigned int size> template <unsigned int size>
BitfieldIndex<size> operator+(const BitfieldIndex<size> &a, const BitfieldIndex<size> &b) { BitfieldIndex<size> x; x.v = x.a + x.b; return x; } BitfieldIndex<size> operator+(const BitfieldIndex<size> &a, const BitfieldIndex<size> &b)
{
BitfieldIndex<size> x;
x.v = a.v + b.v;
return x;
}
template <unsigned int size> template <unsigned int size>
BitfieldIndex<size> operator-(const BitfieldIndex<size> &a, const BitfieldIndex<size> &b) { BitfieldIndex<size> x; x.v = x.a - x.b; return x; } BitfieldIndex<size> operator-(const BitfieldIndex<size> &a, const BitfieldIndex<size> &b)
{
BitfieldIndex<size> x;
x.v = a.v - b.v;
return x;
}
#endif // _UTIL_BITFIELDINDEX_H_ #endif // _UTIL_BITFIELDINDEX_H_

2
sdrgui/dsp/scopevisng.cpp
View File

@ -51,8 +51,6 @@ ScopeVisNG::ScopeVisNG(GLScopeNG* glScope) :
m_timeBase(1), m_timeBase(1),
m_timeOfsProMill(0), m_timeOfsProMill(0),
m_traceStart(true), m_traceStart(true),
m_traceFill(0),
m_zTraceIndex(-1),
m_sampleRate(0), m_sampleRate(0),
m_traceDiscreteMemory(m_nbTraceMemories), m_traceDiscreteMemory(m_nbTraceMemories),
m_freeRun(true), m_freeRun(true),

2
sdrgui/dsp/scopevisng.h
View File

@ -1033,8 +1033,6 @@ private:
uint32_t m_timeBase; //!< Trace display time divisor uint32_t m_timeBase; //!< Trace display time divisor
uint32_t m_timeOfsProMill; //!< Start trace shift in 1/1000 trace size uint32_t m_timeOfsProMill; //!< Start trace shift in 1/1000 trace size
bool m_traceStart; //!< Trace is at start point bool m_traceStart; //!< Trace is at start point
int m_traceFill; //!< Count of samples accumulated into trace
int m_zTraceIndex; //!< Index of the trace used for Z input (luminance or false colors)
SampleVector::const_iterator m_triggerPoint; //!< Trigger start location in the samples vector SampleVector::const_iterator m_triggerPoint; //!< Trigger start location in the samples vector
int m_sampleRate; int m_sampleRate;
TraceBackDiscreteMemory m_traceDiscreteMemory; //!< Complex trace memory for triggered states TODO: vectorize when more than on input is allowed TraceBackDiscreteMemory m_traceDiscreteMemory; //!< Complex trace memory for triggered states TODO: vectorize when more than on input is allowed

2
swagger/sdrangel/code/html2/index.html
View File

@ -16925,7 +16925,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2018-02-20T20:02:08.315+01:00 Generated 2018-03-03T23:35:13.013+01:00
</div> </div>
</div> </div>
</div> </div>

8
swagger/sdrangel/code/qt5/client/SWGAudioDevice.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGAudioDevice* fromJson(QString &jsonString); virtual SWGAudioDevice* fromJson(QString &jsonString) override;
QString* getName(); QString* getName();
void setName(QString* name); void setName(QString* name);

8
swagger/sdrangel/code/qt5/client/SWGAudioDevices.h
View File

@ -37,10 +37,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGAudioDevices* fromJson(QString &jsonString); virtual SWGAudioDevices* fromJson(QString &jsonString) override;
float getInputVolume(); float getInputVolume();
void setInputVolume(float input_volume); void setInputVolume(float input_volume);

8
swagger/sdrangel/code/qt5/client/SWGAudioDevicesSelect.h
View File

@ -35,10 +35,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGAudioDevicesSelect* fromJson(QString &jsonString); virtual SWGAudioDevicesSelect* fromJson(QString &jsonString) override;
float getInputVolume(); float getInputVolume();
void setInputVolume(float input_volume); void setInputVolume(float input_volume);

8
swagger/sdrangel/code/qt5/client/SWGCWKeyerSettings.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGCWKeyerSettings* fromJson(QString &jsonString); virtual SWGCWKeyerSettings* fromJson(QString &jsonString) override;
qint32 getSampleRate(); qint32 getSampleRate();
void setSampleRate(qint32 sample_rate); void setSampleRate(qint32 sample_rate);

8
swagger/sdrangel/code/qt5/client/SWGChannel.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGChannel* fromJson(QString &jsonString); virtual SWGChannel* fromJson(QString &jsonString) override;
qint32 getIndex(); qint32 getIndex();
void setIndex(qint32 index); void setIndex(qint32 index);

8
swagger/sdrangel/code/qt5/client/SWGChannelListItem.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGChannelListItem* fromJson(QString &jsonString); virtual SWGChannelListItem* fromJson(QString &jsonString) override;
QString* getName(); QString* getName();
void setName(QString* name); void setName(QString* name);

8
swagger/sdrangel/code/qt5/client/SWGChannelSettings.h
View File

@ -38,10 +38,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGChannelSettings* fromJson(QString &jsonString); virtual SWGChannelSettings* fromJson(QString &jsonString) override;
QString* getChannelType(); QString* getChannelType();
void setChannelType(QString* channel_type); void setChannelType(QString* channel_type);

8
swagger/sdrangel/code/qt5/client/SWGDVSeralDevices.h
View File

@ -37,10 +37,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGDVSeralDevices* fromJson(QString &jsonString); virtual SWGDVSeralDevices* fromJson(QString &jsonString) override;
qint32 getNbDevices(); qint32 getNbDevices();
void setNbDevices(qint32 nb_devices); void setNbDevices(qint32 nb_devices);

8
swagger/sdrangel/code/qt5/client/SWGDVSerialDevice.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGDVSerialDevice* fromJson(QString &jsonString); virtual SWGDVSerialDevice* fromJson(QString &jsonString) override;
QString* getDeviceName(); QString* getDeviceName();
void setDeviceName(QString* device_name); void setDeviceName(QString* device_name);

8
swagger/sdrangel/code/qt5/client/SWGDeviceListItem.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGDeviceListItem* fromJson(QString &jsonString); virtual SWGDeviceListItem* fromJson(QString &jsonString) override;
QString* getDisplayedName(); QString* getDisplayedName();
void setDisplayedName(QString* displayed_name); void setDisplayedName(QString* displayed_name);

8
swagger/sdrangel/code/qt5/client/SWGDeviceSet.h
View File

@ -38,10 +38,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGDeviceSet* fromJson(QString &jsonString); virtual SWGDeviceSet* fromJson(QString &jsonString) override;
SWGSamplingDevice* getSamplingDevice(); SWGSamplingDevice* getSamplingDevice();
void setSamplingDevice(SWGSamplingDevice* sampling_device); void setSamplingDevice(SWGSamplingDevice* sampling_device);

8
swagger/sdrangel/code/qt5/client/SWGDeviceSetList.h
View File

@ -37,10 +37,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGDeviceSetList* fromJson(QString &jsonString); virtual SWGDeviceSetList* fromJson(QString &jsonString) override;
qint32 getDevicesetcount(); qint32 getDevicesetcount();
void setDevicesetcount(qint32 devicesetcount); void setDevicesetcount(qint32 devicesetcount);

8
swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h
View File

@ -42,10 +42,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGDeviceSettings* fromJson(QString &jsonString); virtual SWGDeviceSettings* fromJson(QString &jsonString) override;
QString* getDeviceHwType(); QString* getDeviceHwType();
void setDeviceHwType(QString* device_hw_type); void setDeviceHwType(QString* device_hw_type);

8
swagger/sdrangel/code/qt5/client/SWGDeviceState.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGDeviceState* fromJson(QString &jsonString); virtual SWGDeviceState* fromJson(QString &jsonString) override;
QString* getState(); QString* getState();
void setState(QString* state); void setState(QString* state);

8
swagger/sdrangel/code/qt5/client/SWGErrorResponse.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGErrorResponse* fromJson(QString &jsonString); virtual SWGErrorResponse* fromJson(QString &jsonString) override;
QString* getMessage(); QString* getMessage();
void setMessage(QString* message); void setMessage(QString* message);

8
swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGFileSourceSettings* fromJson(QString &jsonString); virtual SWGFileSourceSettings* fromJson(QString &jsonString) override;
QString* getFileName(); QString* getFileName();
void setFileName(QString* file_name); void setFileName(QString* file_name);

8
swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h
View File

@ -35,10 +35,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGHackRFInputSettings* fromJson(QString &jsonString); virtual SWGHackRFInputSettings* fromJson(QString &jsonString) override;
qint64 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency); void setCenterFrequency(qint64 center_frequency);

8
swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.h
View File

@ -35,10 +35,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGHackRFOutputSettings* fromJson(QString &jsonString); virtual SWGHackRFOutputSettings* fromJson(QString &jsonString) override;
qint64 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency); void setCenterFrequency(qint64 center_frequency);

2
swagger/sdrangel/code/qt5/client/SWGHelpers.cpp
View File

@ -447,7 +447,7 @@ toJsonArray(QList<void*>* value, QJsonObject* output, QString innerName, QString
if(innerType.startsWith("SWG")){ if(innerType.startsWith("SWG")){
for(void* obj : *value) { for(void* obj : *value) {
SWGObject *SWGobject = reinterpret_cast<SWGObject *>(obj); SWGObject *SWGobject = reinterpret_cast<SWGObject *>(obj);
if(SWGobject != nullptr) if(SWGobject != nullptr)
{ {
QJsonObject* o = SWGobject->asJsonObject(); QJsonObject* o = SWGobject->asJsonObject();
outputarray.append(*o); outputarray.append(*o);

8
swagger/sdrangel/code/qt5/client/SWGInstanceChannelsResponse.h
View File

@ -37,10 +37,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGInstanceChannelsResponse* fromJson(QString &jsonString); virtual SWGInstanceChannelsResponse* fromJson(QString &jsonString) override;
qint32 getChannelcount(); qint32 getChannelcount();
void setChannelcount(qint32 channelcount); void setChannelcount(qint32 channelcount);

8
swagger/sdrangel/code/qt5/client/SWGInstanceDevicesResponse.h
View File

@ -37,10 +37,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGInstanceDevicesResponse* fromJson(QString &jsonString); virtual SWGInstanceDevicesResponse* fromJson(QString &jsonString) override;
qint32 getDevicecount(); qint32 getDevicecount();
void setDevicecount(qint32 devicecount); void setDevicecount(qint32 devicecount);

8
swagger/sdrangel/code/qt5/client/SWGInstanceSummaryResponse.h
View File

@ -38,10 +38,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGInstanceSummaryResponse* fromJson(QString &jsonString); virtual SWGInstanceSummaryResponse* fromJson(QString &jsonString) override;
QString* getVersion(); QString* getVersion();
void setVersion(QString* version); void setVersion(QString* version);

8
swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h
View File

@ -35,10 +35,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGLimeSdrInputSettings* fromJson(QString &jsonString); virtual SWGLimeSdrInputSettings* fromJson(QString &jsonString) override;
qint64 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency); void setCenterFrequency(qint64 center_frequency);

8
swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputSettings.h
View File

@ -35,10 +35,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGLimeSdrOutputSettings* fromJson(QString &jsonString); virtual SWGLimeSdrOutputSettings* fromJson(QString &jsonString) override;
qint64 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency); void setCenterFrequency(qint64 center_frequency);

8
swagger/sdrangel/code/qt5/client/SWGLocationInformation.h
View File

@ -35,10 +35,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGLocationInformation* fromJson(QString &jsonString); virtual SWGLocationInformation* fromJson(QString &jsonString) override;
float getLatitude(); float getLatitude();
void setLatitude(float latitude); void setLatitude(float latitude);

8
swagger/sdrangel/code/qt5/client/SWGLoggingInfo.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGLoggingInfo* fromJson(QString &jsonString); virtual SWGLoggingInfo* fromJson(QString &jsonString) override;
QString* getConsoleLevel(); QString* getConsoleLevel();
void setConsoleLevel(QString* console_level); void setConsoleLevel(QString* console_level);

8
swagger/sdrangel/code/qt5/client/SWGNFMDemodSettings.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGNFMDemodSettings* fromJson(QString &jsonString); virtual SWGNFMDemodSettings* fromJson(QString &jsonString) override;
qint64 getInputFrequencyOffset(); qint64 getInputFrequencyOffset();
void setInputFrequencyOffset(qint64 input_frequency_offset); void setInputFrequencyOffset(qint64 input_frequency_offset);

8
swagger/sdrangel/code/qt5/client/SWGNFMModSettings.h
View File

@ -37,10 +37,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGNFMModSettings* fromJson(QString &jsonString); virtual SWGNFMModSettings* fromJson(QString &jsonString) override;
qint64 getInputFrequencyOffset(); qint64 getInputFrequencyOffset();
void setInputFrequencyOffset(qint64 input_frequency_offset); void setInputFrequencyOffset(qint64 input_frequency_offset);

8
swagger/sdrangel/code/qt5/client/SWGPresetExport.h
View File

@ -37,10 +37,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGPresetExport* fromJson(QString &jsonString); virtual SWGPresetExport* fromJson(QString &jsonString) override;
QString* getFilePath(); QString* getFilePath();
void setFilePath(QString* file_path); void setFilePath(QString* file_path);

8
swagger/sdrangel/code/qt5/client/SWGPresetGroup.h
View File

@ -38,10 +38,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGPresetGroup* fromJson(QString &jsonString); virtual SWGPresetGroup* fromJson(QString &jsonString) override;
QString* getGroupName(); QString* getGroupName();
void setGroupName(QString* group_name); void setGroupName(QString* group_name);

8
swagger/sdrangel/code/qt5/client/SWGPresetIdentifier.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGPresetIdentifier* fromJson(QString &jsonString); virtual SWGPresetIdentifier* fromJson(QString &jsonString) override;
QString* getGroupName(); QString* getGroupName();
void setGroupName(QString* group_name); void setGroupName(QString* group_name);

8
swagger/sdrangel/code/qt5/client/SWGPresetImport.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGPresetImport* fromJson(QString &jsonString); virtual SWGPresetImport* fromJson(QString &jsonString) override;
QString* getGroupName(); QString* getGroupName();
void setGroupName(QString* group_name); void setGroupName(QString* group_name);

8
swagger/sdrangel/code/qt5/client/SWGPresetItem.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGPresetItem* fromJson(QString &jsonString); virtual SWGPresetItem* fromJson(QString &jsonString) override;
qint64 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint64 center_frequency); void setCenterFrequency(qint64 center_frequency);

8
swagger/sdrangel/code/qt5/client/SWGPresetTransfer.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGPresetTransfer* fromJson(QString &jsonString); virtual SWGPresetTransfer* fromJson(QString &jsonString) override;
qint32 getDeviceSetIndex(); qint32 getDeviceSetIndex();
void setDeviceSetIndex(qint32 device_set_index); void setDeviceSetIndex(qint32 device_set_index);

8
swagger/sdrangel/code/qt5/client/SWGPresets.h
View File

@ -37,10 +37,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGPresets* fromJson(QString &jsonString); virtual SWGPresets* fromJson(QString &jsonString) override;
qint32 getNbGroups(); qint32 getNbGroups();
void setNbGroups(qint32 nb_groups); void setNbGroups(qint32 nb_groups);

8
swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h
View File

@ -35,10 +35,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGRtlSdrSettings* fromJson(QString &jsonString); virtual SWGRtlSdrSettings* fromJson(QString &jsonString) override;
qint32 getDevSampleRate(); qint32 getDevSampleRate();
void setDevSampleRate(qint32 dev_sample_rate); void setDevSampleRate(qint32 dev_sample_rate);

8
swagger/sdrangel/code/qt5/client/SWGSamplingDevice.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGSamplingDevice* fromJson(QString &jsonString); virtual SWGSamplingDevice* fromJson(QString &jsonString) override;
qint32 getIndex(); qint32 getIndex();
void setIndex(qint32 index); void setIndex(qint32 index);

8
swagger/sdrangel/code/qt5/client/SWGSuccessResponse.h
View File

@ -36,10 +36,10 @@ public:
void init(); void init();
void cleanup(); void cleanup();
QString asJson (); virtual QString asJson () override;
QJsonObject* asJsonObject(); virtual QJsonObject* asJsonObject() override;
void fromJsonObject(QJsonObject &json); virtual void fromJsonObject(QJsonObject &json) override;
SWGSuccessResponse* fromJson(QString &jsonString); virtual SWGSuccessResponse* fromJson(QString &jsonString) override;
QString* getMessage(); QString* getMessage();
void setMessage(QString* message); void setMessage(QString* message);