VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

Massive UI revamping (v7): fixed device workspace index save/restore and removed useless geometry blobs. Fixes #1207

Browse Source
This commit is contained in:
f4exb 2022-04-20 20:08:41 +02:00
parent f9985ad061
commit 249db03cf3
133 changed files with 8 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::BladeRF2MIMOGui* ui;

8
plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.cpp
View File

@ -58,8 +58,6 @@ void BladeRF2MIMOSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray BladeRF2MIMOSettings::serialize() const
@ -99,9 +97,6 @@ QByteArray BladeRF2MIMOSettings::serialize() const
s.writeU32(53, m_reverseAPIPort);
s.writeU32(54, m_reverseAPIDeviceIndex);
s.writeS32(55, m_workspaceIndex);
s.writeBlob(56, m_geometryBytes);
return s.final();
}
@ -163,9 +158,6 @@ bool BladeRF2MIMOSettings::deserialize(const QByteArray& data)
d.readU32(54, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(55,&m_workspaceIndex, 0);
d.readBlob(56, &m_geometryBytes);
return true;
}
else

2
plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.h
View File

@ -60,8 +60,6 @@ struct BladeRF2MIMOSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
BladeRF2MIMOSettings();
void resetToDefaults();

4
plugins/samplemimo/limesdrmimo/limesdrmimogui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::LimeSDRMIMOGUI* ui;

8
plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp
View File

@ -86,8 +86,6 @@ void LimeSDRMIMOSettings::resetToDefaults()
m_lpfFIRBWTx1 = 2.5e6f;
m_gainTx1 = 4;
m_antennaPathTx1 = PATH_RFE_TX_NONE;
m_workspaceIndex = 0;
}
QByteArray LimeSDRMIMOSettings::serialize() const
@ -155,9 +153,6 @@ QByteArray LimeSDRMIMOSettings::serialize() const
s.writeU32(93, m_gainTx1);
s.writeS32(94, (int) m_antennaPathTx1);
s.writeS32(95, m_workspaceIndex);
s.writeBlob(96, m_geometryBytes);
return s.final();
}
@ -253,9 +248,6 @@ bool LimeSDRMIMOSettings::deserialize(const QByteArray& data)
d.readS32(94, &intval, 0);
m_antennaPathTx1 = (PathTxRFE) intval;
d.readS32(95, &m_workspaceIndex, 0);
d.readBlob(96, &m_geometryBytes);
return true;
}
else

3
plugins/samplemimo/limesdrmimo/limesdrmimosettings.h
View File

@ -119,9 +119,6 @@ struct LimeSDRMIMOSettings
uint32_t m_gainTx1; //!< Tx[1] Optimally distributed gain (dB)
PathTxRFE m_antennaPathTx1; //!< Tx[1] Antenna connection
int m_workspaceIndex;
QByteArray m_geometryBytes;
LimeSDRMIMOSettings();
void resetToDefaults();
QByteArray serialize() const;

4
plugins/samplemimo/metismiso/metismisogui.h
View File

@ -45,10 +45,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::MetisMISOGui* ui;

5
plugins/samplemimo/metismiso/metismisosettings.cpp
View File

@ -82,7 +82,6 @@ void MetisMISOSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray MetisMISOSettings::serialize() const
@ -113,8 +112,6 @@ QByteArray MetisMISOSettings::serialize() const
s.writeU32(22, m_reverseAPIDeviceIndex);
s.writeS32(23, m_streamIndex);
s.writeS32(24, m_spectrumStreamIndex);
s.writeS32(25, m_workspaceIndex);
s.writeBlob(26, m_geometryBytes);
for (int i = 0; i < m_maxReceivers; i++)
{
@ -178,8 +175,6 @@ bool MetisMISOSettings::deserialize(const QByteArray& data)
d.readS32(23, &m_streamIndex, 0);
d.readS32(24, &m_spectrumStreamIndex, 0);
d.readS32(25, &m_workspaceIndex, 0);
d.readBlob(26, &m_geometryBytes);
return true;
}

2
plugins/samplemimo/metismiso/metismisosettings.h
View File

@ -48,8 +48,6 @@ struct MetisMISOSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
MetisMISOSettings();
MetisMISOSettings(const MetisMISOSettings& other);

4
plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::PlutoSDRMIMOGUI* ui;

7
plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.cpp
View File

@ -77,7 +77,6 @@ void PlutoSDRMIMOSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray PlutoSDRMIMOSettings::serialize() const
@ -142,9 +141,6 @@ QByteArray PlutoSDRMIMOSettings::serialize() const
s.writeU32(102, m_reverseAPIPort);
s.writeU32(103, m_reverseAPIDeviceIndex);
s.writeS32(104, m_workspaceIndex);
s.writeBlob(105, m_geometryBytes);
return s.final();
}
@ -279,9 +275,6 @@ bool PlutoSDRMIMOSettings::deserialize(const QByteArray& data)
d.readU32(103, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(104, &m_workspaceIndex, 0);
d.readBlob(105, &m_geometryBytes);
return true;
}
else

2
plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.h
View File

@ -121,8 +121,6 @@ struct PlutoSDRMIMOSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
static const int m_plutoSDRBlockSizeSamples = 64*256; //complex samples per buffer (must be multiple of 64)

4
plugins/samplemimo/testmi/testmigui.h
View File

@ -45,10 +45,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::TestMIGui* ui;

6
plugins/samplemimo/testmi/testmisettings.cpp
View File

@ -50,7 +50,6 @@ TestMISettings::TestMISettings()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
m_streams.push_back(TestMIStreamSettings());
m_streams.push_back(TestMIStreamSettings());
}
@ -62,7 +61,6 @@ TestMISettings::TestMISettings(const TestMISettings& other) :
m_reverseAPIAddress = other.m_reverseAPIAddress;
m_reverseAPIPort = other.m_reverseAPIPort;
m_reverseAPIDeviceIndex = other.m_reverseAPIDeviceIndex;
m_workspaceIndex = other.m_workspaceIndex;
}
void TestMISettings::resetToDefaults()
@ -80,8 +78,6 @@ QByteArray TestMISettings::serialize() const
s.writeString(2, m_reverseAPIAddress);
s.writeU32(3, m_reverseAPIPort);
s.writeU32(4, m_reverseAPIDeviceIndex);
s.writeS32(5, m_workspaceIndex);
s.writeBlob(6, m_geometryBytes);
for (unsigned int i = 0; i < m_streams.size(); i++)
{
@ -132,8 +128,6 @@ bool TestMISettings::deserialize(const QByteArray& data)
d.readU32(4, &utmp, 0);
m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp;
d.readS32(5, &m_workspaceIndex, 0);
d.readBlob(6, &m_geometryBytes);
for (unsigned int i = 0; i < m_streams.size(); i++)
{

2
plugins/samplemimo/testmi/testmisettings.h
View File

@ -71,8 +71,6 @@ struct TestMISettings
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
std::vector<TestMIStreamSettings> m_streams;
TestMISettings();

4
plugins/samplemimo/testmosync/testmosyncgui.h
View File

@ -47,10 +47,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::TestMOSyncGui* ui;

5
plugins/samplemimo/testmosync/testmosyncsettings.cpp
View File

@ -31,7 +31,6 @@ void TestMOSyncSettings::resetToDefaults()
m_sampleRate = 48000;
m_log2Interp = 0;
m_fcPosTx = FC_POS_CENTER;
m_workspaceIndex = 0;
m_useReverseAPI = false;
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
@ -45,8 +44,6 @@ QByteArray TestMOSyncSettings::serialize() const
s.writeU64(1, m_sampleRate);
s.writeU32(2, m_log2Interp);
s.writeS32(3, (int) m_fcPosTx);
s.writeS32(4, m_workspaceIndex);
s.writeBlob(5, m_geometryBytes);
s.writeBool(6, m_useReverseAPI);
s.writeString(7, m_reverseAPIAddress);
s.writeU32(8, m_reverseAPIPort);
@ -74,8 +71,6 @@ bool TestMOSyncSettings::deserialize(const QByteArray& data)
d.readU32(2, &m_log2Interp, 0);
d.readS32(3, &intval, 2);
m_fcPosTx = (fcPos_t) intval;
d.readS32(4, &m_workspaceIndex, 0);
d.readBlob(5, &m_geometryBytes);
d.readBool(1, &m_useReverseAPI, false);
d.readString(2, &m_reverseAPIAddress, "127.0.0.1");
d.readU32(3, &utmp, 0);

4
plugins/samplemimo/testmosync/testmosyncsettings.h
View File

@ -18,8 +18,6 @@
#ifndef PLUGINS_SAMPLEMIMO_TESTMOSYNC_TESTMOSYNCSETTINGS_H_
#define PLUGINS_SAMPLEMIMO_TESTMOSYNC_TESTMOSYNCSETTINGS_H_
#include <QByteArray>
struct TestMOSyncSettings {
typedef enum {
FC_POS_INFRA = 0,
@ -35,8 +33,6 @@ struct TestMOSyncSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
static const unsigned int m_msThrottle;

4
plugins/samplemimo/xtrxmimo/xtrxmimogui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::XTRXMIMOGUI* ui;

5
plugins/samplemimo/xtrxmimo/xtrxmimosettings.cpp
View File

@ -75,8 +75,6 @@ void XTRXMIMOSettings::resetToDefaults()
m_lpfBWTx1 = 4.5e6f;
m_gainTx1 = 20;
m_pwrmodeTx1 = 4;
// GUI
m_workspaceIndex = 0;
}
QByteArray XTRXMIMOSettings::serialize() const
@ -131,9 +129,6 @@ QByteArray XTRXMIMOSettings::serialize() const
s.writeFloat(90, m_lpfBWTx1);
s.writeU32(91, m_gainTx1);
s.writeU32(92, m_pwrmodeTx1);
// GUI
s.writeS32(93, m_workspaceIndex);
s.writeBlob(94, m_geometryBytes);
return s.final();
}

3
plugins/samplemimo/xtrxmimo/xtrxmimosettings.h
View File

@ -93,9 +93,6 @@ struct XTRXMIMOSettings
float m_lpfBWTx1; //!< LMS analog lowpass filter bandwidth (Hz)
uint32_t m_gainTx1; //!< Optimally distributed gain (dB)
uint32_t m_pwrmodeTx1;
// GUI
int m_workspaceIndex;
QByteArray m_geometryBytes;
XTRXMIMOSettings();
void resetToDefaults();

4
plugins/samplesink/audiooutput/audiooutputgui.h
View File

@ -45,10 +45,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::AudioOutputGui* ui;

5
plugins/samplesink/audiooutput/audiooutputsettings.cpp
View File

@ -34,7 +34,6 @@ void AudioOutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray AudioOutputSettings::serialize() const
@ -44,8 +43,6 @@ QByteArray AudioOutputSettings::serialize() const
s.writeString(1, m_deviceName);
s.writeFloat(3, m_volume);
s.writeS32(5, (int)m_iqMapping);
s.writeS32(6, m_workspaceIndex);
s.writeBlob(7, m_geometryBytes);
s.writeBool(24, m_useReverseAPI);
s.writeString(25, m_reverseAPIAddress);
@ -72,8 +69,6 @@ bool AudioOutputSettings::deserialize(const QByteArray& data)
d.readString(1, &m_deviceName, "");
d.readFloat(3, &m_volume, 1.0f);
d.readS32(5, (int *)&m_iqMapping, IQMapping::LR);
d.readS32(6, &m_workspaceIndex, 0);
d.readBlob(7, &m_geometryBytes);
d.readBool(24, &m_useReverseAPI, false);
d.readString(25, &m_reverseAPIAddress, "127.0.0.1");

2
plugins/samplesink/audiooutput/audiooutputsettings.h
View File

@ -34,8 +34,6 @@ struct AudioOutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
AudioOutputSettings();
void resetToDefaults();

4
plugins/samplesink/bladerf1output/bladerf1outputgui.h
View File

@ -45,10 +45,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::Bladerf1OutputGui* ui;

5
plugins/samplesink/bladerf1output/bladerf1outputsettings.cpp
View File

@ -41,7 +41,6 @@ void BladeRF1OutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray BladeRF1OutputSettings::serialize() const
@ -60,8 +59,6 @@ QByteArray BladeRF1OutputSettings::serialize() const
s.writeString(10, m_reverseAPIAddress);
s.writeU32(11, m_reverseAPIPort);
s.writeU32(12, m_reverseAPIDeviceIndex);
s.writeS32(13, m_workspaceIndex);
s.writeBlob(14, m_geometryBytes);
return s.final();
}
@ -103,8 +100,6 @@ bool BladeRF1OutputSettings::deserialize(const QByteArray& data)
d.readU32(12, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(13, &m_workspaceIndex, 0);
d.readBlob(14, &m_geometryBytes);
return true;
}

2
plugins/samplesink/bladerf1output/bladerf1outputsettings.h
View File

@ -37,8 +37,6 @@ struct BladeRF1OutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
BladeRF1OutputSettings();
void resetToDefaults();

4
plugins/samplesink/bladerf2output/bladerf2outputgui.h
View File

@ -46,10 +46,6 @@ public:
virtual bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual bool handleMessage(const Message& message);
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::BladeRF2OutputGui* ui;

5
plugins/samplesink/bladerf2output/bladerf2outputsettings.cpp
View File

@ -41,7 +41,6 @@ void BladeRF2OutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray BladeRF2OutputSettings::serialize() const
@ -60,8 +59,6 @@ QByteArray BladeRF2OutputSettings::serialize() const
s.writeString(10, m_reverseAPIAddress);
s.writeU32(11, m_reverseAPIPort);
s.writeU32(12, m_reverseAPIDeviceIndex);
s.writeS32(13, m_workspaceIndex);
s.writeBlob(14, m_geometryBytes);
return s.final();
}
@ -100,8 +97,6 @@ bool BladeRF2OutputSettings::deserialize(const QByteArray& data)
d.readU32(12, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(13, &m_workspaceIndex, 0);
d.readBlob(14, &m_geometryBytes);
return true;
}

2
plugins/samplesink/bladerf2output/bladerf2outputsettings.h
View File

@ -35,8 +35,6 @@ struct BladeRF2OutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
BladeRF2OutputSettings();
void resetToDefaults();

4
plugins/samplesink/fileoutput/fileoutputgui.h
View File

@ -47,10 +47,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::FileOutputGui* ui;

5
plugins/samplesink/fileoutput/fileoutputsettings.cpp
View File

@ -33,7 +33,6 @@ void FileOutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray FileOutputSettings::serialize() const
@ -47,8 +46,6 @@ QByteArray FileOutputSettings::serialize() const
s.writeString(5, m_reverseAPIAddress);
s.writeU32(6, m_reverseAPIPort);
s.writeU32(7, m_reverseAPIDeviceIndex);
s.writeS32(8, m_workspaceIndex);
s.writeBlob(9, m_geometryBytes);
return s.final();
}
@ -82,8 +79,6 @@ bool FileOutputSettings::deserialize(const QByteArray& data)
d.readU32(7, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(8, &m_workspaceIndex, 0);
d.readBlob(9, &m_geometryBytes);
return true;
}

4
plugins/samplesink/fileoutput/fileoutputsettings.h
View File

@ -18,8 +18,6 @@
#ifndef PLUGINS_SAMPLESINK_FILEOUTPUT_FILEOUTPUTSETTINGS_H_
#define PLUGINS_SAMPLESINK_FILEOUTPUT_FILEOUTPUTSETTINGS_H_
#include <QByteArray>
struct FileOutputSettings {
quint64 m_centerFrequency;
quint64 m_sampleRate;
@ -29,8 +27,6 @@ struct FileOutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
FileOutputSettings();
void resetToDefaults();

4
plugins/samplesink/hackrfoutput/hackrfoutputgui.h
View File

@ -55,10 +55,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::HackRFOutputGui* ui;

5
plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp
View File

@ -43,7 +43,6 @@ void HackRFOutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray HackRFOutputSettings::serialize() const
@ -64,8 +63,6 @@ QByteArray HackRFOutputSettings::serialize() const
s.writeU32(12, m_reverseAPIDeviceIndex);
s.writeBool(13, m_transverterMode);
s.writeS64(14, m_transverterDeltaFrequency);
s.writeS32(15, m_workspaceIndex);
s.writeBlob(16, m_geometryBytes);
return s.final();
}
@ -108,8 +105,6 @@ bool HackRFOutputSettings::deserialize(const QByteArray& data)
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(13, &m_transverterMode, false);
d.readS64(14, &m_transverterDeltaFrequency, 0);
d.readS32(15, &m_workspaceIndex, 0);
d.readBlob(16, &m_geometryBytes);
return true;
}

2
plugins/samplesink/hackrfoutput/hackrfoutputsettings.h
View File

@ -43,8 +43,6 @@ struct HackRFOutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
HackRFOutputSettings();
void resetToDefaults();

4
plugins/samplesink/limesdroutput/limesdroutputgui.h
View File

@ -45,10 +45,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::LimeSDROutputGUI* ui;

5
plugins/samplesink/limesdroutput/limesdroutputsettings.cpp
View File

@ -47,7 +47,6 @@ void LimeSDROutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray LimeSDROutputSettings::serialize() const
@ -74,8 +73,6 @@ QByteArray LimeSDROutputSettings::serialize() const
s.writeString(21, m_reverseAPIAddress);
s.writeU32(22, m_reverseAPIPort);
s.writeU32(23, m_reverseAPIDeviceIndex);
s.writeS32(24, m_workspaceIndex);
s.writeBlob(25, m_geometryBytes);
return s.final();
}
@ -126,8 +123,6 @@ bool LimeSDROutputSettings::deserialize(const QByteArray& data)
d.readU32(23, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(24, &m_workspaceIndex, 0);
d.readBlob(25, &m_geometryBytes);
return true;
}

2
plugins/samplesink/limesdroutput/limesdroutputsettings.h
View File

@ -65,8 +65,6 @@ struct LimeSDROutputSettings
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
LimeSDROutputSettings();
void resetToDefaults();

4
plugins/samplesink/localoutput/localoutputgui.h
View File

@ -46,10 +46,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::LocalOutputGui* ui;

5
plugins/samplesink/localoutput/localoutputsettings.cpp
View File

@ -29,7 +29,6 @@ void LocalOutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray LocalOutputSettings::serialize() const
@ -39,8 +38,6 @@ QByteArray LocalOutputSettings::serialize() const
s.writeString(4, m_reverseAPIAddress);
s.writeU32(5, m_reverseAPIPort);
s.writeU32(6, m_reverseAPIDeviceIndex);
s.writeS32(7, m_workspaceIndex);
s.writeBlob(8, m_geometryBytes);
return s.final();
}
@ -70,8 +67,6 @@ bool LocalOutputSettings::deserialize(const QByteArray& data)
d.readU32(6, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(7, &m_workspaceIndex, 0);
d.readBlob(8, &m_geometryBytes);
return true;
}

2
plugins/samplesink/localoutput/localoutputsettings.h
View File

@ -26,8 +26,6 @@ struct LocalOutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
LocalOutputSettings();
void resetToDefaults();

4
plugins/samplesink/plutosdroutput/plutosdroutputgui.h
View File

@ -47,10 +47,6 @@ public:
virtual QByteArray serialize() const;
virtual bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::PlutoSDROutputGUI* ui;

5
plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp
View File

@ -44,7 +44,6 @@ void PlutoSDROutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray PlutoSDROutputSettings::serialize() const
@ -67,8 +66,6 @@ QByteArray PlutoSDROutputSettings::serialize() const
s.writeString(18, m_reverseAPIAddress);
s.writeU32(19, m_reverseAPIPort);
s.writeU32(20, m_reverseAPIDeviceIndex);
s.writeS32(21, m_workspaceIndex);
s.writeBlob(22, m_geometryBytes);
return s.final();
}
@ -122,8 +119,6 @@ bool PlutoSDROutputSettings::deserialize(const QByteArray& data)
d.readU32(20, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(21, &m_workspaceIndex, 0);
d.readBlob(22, &m_geometryBytes);
return true;
}

2
plugins/samplesink/plutosdroutput/plutosdroutputsettings.h
View File

@ -51,8 +51,6 @@ struct PlutoSDROutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
PlutoSDROutputSettings();
void resetToDefaults();

4
plugins/samplesink/remoteoutput/remoteoutputgui.h
View File

@ -77,10 +77,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::RemoteOutputGui* ui;

5
plugins/samplesink/remoteoutput/remoteoutputsettings.cpp
View File

@ -37,7 +37,6 @@ void RemoteOutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray RemoteOutputSettings::serialize() const
@ -56,8 +55,6 @@ QByteArray RemoteOutputSettings::serialize() const
s.writeString(13, m_reverseAPIAddress);
s.writeU32(14, m_reverseAPIPort);
s.writeU32(15, m_reverseAPIDeviceIndex);
s.writeS32(16, m_workspaceIndex);
s.writeBlob(17, m_geometryBytes);
return s.final();
}
@ -98,8 +95,6 @@ bool RemoteOutputSettings::deserialize(const QByteArray& data)
d.readU32(15, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(16, &m_workspaceIndex, 0);
d.readBlob(17, &m_geometryBytes);
return true;
}

2
plugins/samplesink/remoteoutput/remoteoutputsettings.h
View File

@ -34,8 +34,6 @@ struct RemoteOutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
RemoteOutputSettings();
void resetToDefaults();

4
plugins/samplesink/soapysdroutput/soapysdroutputgui.h
View File

@ -53,10 +53,6 @@ public:
virtual QByteArray serialize() const;
virtual bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
void createRangesControl(

5
plugins/samplesink/soapysdroutput/soapysdroutputsettings.cpp
View File

@ -47,7 +47,6 @@ void SoapySDROutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray SoapySDROutputSettings::serialize() const
@ -77,8 +76,6 @@ QByteArray SoapySDROutputSettings::serialize() const
s.writeString(24, m_reverseAPIAddress);
s.writeU32(25, m_reverseAPIPort);
s.writeU32(26, m_reverseAPIDeviceIndex);
s.writeS32(27, m_workspaceIndex);
s.writeBlob(28, m_geometryBytes);
return s.final();
}
@ -136,8 +133,6 @@ bool SoapySDROutputSettings::deserialize(const QByteArray& data)
d.readU32(26, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(27, &m_workspaceIndex, 0);
d.readBlob(28, &m_geometryBytes);
return true;
}

2
plugins/samplesink/soapysdroutput/soapysdroutputsettings.h
View File

@ -45,8 +45,6 @@ struct SoapySDROutputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
SoapySDROutputSettings();
void resetToDefaults();

4
plugins/samplesink/testsink/testsinkgui.h
View File

@ -48,10 +48,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::TestSinkGui* ui;

5
plugins/samplesink/testsink/testsinksettings.cpp
View File

@ -30,7 +30,6 @@ void TestSinkSettings::resetToDefaults()
m_sampleRate = 48000;
m_log2Interp = 0;
m_spectrumGUI = nullptr;
m_workspaceIndex = 0;
m_useReverseAPI = false;
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
@ -49,8 +48,6 @@ QByteArray TestSinkSettings::serialize() const
s.writeBlob(4, m_spectrumGUI->serialize());
}
s.writeS32(5, m_workspaceIndex);
s.writeBlob(6, m_geometryBytes);
s.writeBool(7, m_useReverseAPI);
s.writeString(8, m_reverseAPIAddress);
s.writeU32(9, m_reverseAPIPort);
@ -83,8 +80,6 @@ bool TestSinkSettings::deserialize(const QByteArray& data)
m_spectrumGUI->deserialize(bytetmp);
}
d.readS32(5, &m_workspaceIndex, 0);
d.readBlob(6, &m_geometryBytes);
d.readBool(7, &m_useReverseAPI, false);
d.readString(8, &m_reverseAPIAddress, "127.0.0.1");
d.readU32(9, &uintval, 0);

2
plugins/samplesink/testsink/testsinksettings.h
View File

@ -27,8 +27,6 @@ struct TestSinkSettings {
quint64 m_sampleRate;
quint32 m_log2Interp;
Serializable *m_spectrumGUI;
int m_workspaceIndex;
QByteArray m_geometryBytes;
bool m_useReverseAPI;
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;

4
plugins/samplesink/usrpoutput/usrpoutputgui.h
View File

@ -52,10 +52,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual bool handleMessage(const Message& message);
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::USRPOutputGUI* ui;

5
plugins/samplesink/usrpoutput/usrpoutputsettings.cpp
View File

@ -42,7 +42,6 @@ void USRPOutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray USRPOutputSettings::serialize() const
@ -62,8 +61,6 @@ QByteArray USRPOutputSettings::serialize() const
s.writeU32(11, m_reverseAPIPort);
s.writeU32(12, m_reverseAPIDeviceIndex);
s.writeS32(13, m_loOffset);
s.writeS32(14, m_workspaceIndex);
s.writeBlob(15, m_geometryBytes);
return s.final();
}
@ -103,8 +100,6 @@ bool USRPOutputSettings::deserialize(const QByteArray& data)
d.readU32(12, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(13, &m_loOffset, 0);
d.readS32(14, &m_workspaceIndex, 0);
d.readBlob(15, &m_geometryBytes);
return true;
}

2
plugins/samplesink/usrpoutput/usrpoutputsettings.h
View File

@ -47,8 +47,6 @@ struct USRPOutputSettings
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
USRPOutputSettings();
void resetToDefaults();

4
plugins/samplesink/xtrxoutput/xtrxoutputgui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::XTRXOutputGUI* ui;

5
plugins/samplesink/xtrxoutput/xtrxoutputsettings.cpp
View File

@ -42,7 +42,6 @@ void XTRXOutputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray XTRXOutputSettings::serialize() const
@ -64,8 +63,6 @@ QByteArray XTRXOutputSettings::serialize() const
s.writeString(13, m_reverseAPIAddress);
s.writeU32(14, m_reverseAPIPort);
s.writeU32(15, m_reverseAPIDeviceIndex);
s.writeS32(16, m_workspaceIndex);
s.writeBlob(17, m_geometryBytes);
return s.final();
}
@ -109,8 +106,6 @@ bool XTRXOutputSettings::deserialize(const QByteArray& data)
d.readU32(15, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(16, &m_workspaceIndex, 0);
d.readBlob(17, &m_geometryBytes);
return true;
}

2
plugins/samplesink/xtrxoutput/xtrxoutputsettings.h
View File

@ -49,8 +49,6 @@ struct XTRXOutputSettings
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
XTRXOutputSettings();
void resetToDefaults();

4
plugins/samplesource/airspy/airspygui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
uint32_t getDevSampleRate(unsigned int index);
int getDevSampleRateIndex(uint32_t sampleRate);

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

@ -46,7 +46,6 @@ void AirspySettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray AirspySettings::serialize() const
@ -72,8 +71,6 @@ QByteArray AirspySettings::serialize() const
s.writeU32(17, m_reverseAPIPort);
s.writeU32(18, m_reverseAPIDeviceIndex);
s.writeBool(19, m_iqOrder);
s.writeS32(20, m_workspaceIndex);
s.writeBlob(21, m_geometryBytes);
return s.final();
}
@ -121,8 +118,6 @@ bool AirspySettings::deserialize(const QByteArray& data)
d.readU32(18, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(19, &m_iqOrder, true);
d.readS32(20, &m_workspaceIndex, 0);
d.readBlob(21, &m_geometryBytes);
return true;
}

2
plugins/samplesource/airspy/airspysettings.h
View File

@ -47,8 +47,6 @@ struct AirspySettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
AirspySettings();
void resetToDefaults();

4
plugins/samplesource/airspyhf/airspyhfgui.h
View File

@ -45,10 +45,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
uint32_t getDevSampleRate(unsigned int index);
int getDevSampleRateIndex(uint32_t sampleRate);

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

@ -46,7 +46,6 @@ void AirspyHFSettings::resetToDefaults()
m_attenuatorSteps = 0;
m_dcBlock = false;
m_iqCorrection = false;
m_workspaceIndex = 0;
}
QByteArray AirspyHFSettings::serialize() const
@ -71,8 +70,6 @@ QByteArray AirspyHFSettings::serialize() const
s.writeBool(19, m_dcBlock);
s.writeBool(20, m_iqCorrection);
s.writeBool(21, m_iqOrder);
s.writeS32(22, m_workspaceIndex);
s.writeBlob(23, m_geometryBytes);
return s.final();
}
@ -120,8 +117,6 @@ bool AirspyHFSettings::deserialize(const QByteArray& data)
d.readBool(19, &m_dcBlock, false);
d.readBool(20, &m_iqCorrection, false);
d.readBool(21, &m_iqOrder, true);
d.readS32(22, &m_workspaceIndex, 0);
d.readBlob(23, &m_geometryBytes);
return true;
}

2
plugins/samplesource/airspyhf/airspyhfsettings.h
View File

@ -41,8 +41,6 @@ struct AirspyHFSettings
quint32 m_attenuatorSteps;
bool m_dcBlock;
bool m_iqCorrection;
int m_workspaceIndex;
QByteArray m_geometryBytes;
AirspyHFSettings();
void resetToDefaults();

4
plugins/samplesource/audioinput/audioinputgui.h
View File

@ -46,10 +46,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::AudioInputGui* ui;

5
plugins/samplesource/audioinput/audioinputsettings.cpp
View File

@ -36,7 +36,6 @@ void AudioInputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray AudioInputSettings::serialize() const
@ -48,8 +47,6 @@ QByteArray AudioInputSettings::serialize() const
s.writeFloat(3, m_volume);
s.writeU32(4, m_log2Decim);
s.writeS32(5, (int)m_iqMapping);
s.writeS32(6, m_workspaceIndex);
s.writeBlob(7, m_geometryBytes);
s.writeBool(24, m_useReverseAPI);
s.writeString(25, m_reverseAPIAddress);
@ -78,8 +75,6 @@ bool AudioInputSettings::deserialize(const QByteArray& data)
d.readFloat(3, &m_volume, 1.0f);
d.readU32(4, &m_log2Decim, 0);
d.readS32(5, (int *)&m_iqMapping, IQMapping::L);
d.readS32(6, &m_workspaceIndex, 0);
d.readBlob(7, &m_geometryBytes);
d.readBool(24, &m_useReverseAPI, false);
d.readString(25, &m_reverseAPIAddress, "127.0.0.1");

2
plugins/samplesource/audioinput/audioinputsettings.h
View File

@ -39,8 +39,6 @@ struct AudioInputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
AudioInputSettings();
void resetToDefaults();

4
plugins/samplesource/bladerf1input/bladerf1inputgui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::Bladerf1InputGui* ui;

5
plugins/samplesource/bladerf1input/bladerf1inputsettings.cpp
View File

@ -47,7 +47,6 @@ void BladeRF1InputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray BladeRF1InputSettings::serialize() const
@ -71,8 +70,6 @@ QByteArray BladeRF1InputSettings::serialize() const
s.writeU32(15, m_reverseAPIPort);
s.writeU32(16, m_reverseAPIDeviceIndex);
s.writeBool(17, m_iqOrder);
s.writeS32(18, m_workspaceIndex);
s.writeBlob(19, m_geometryBytes);
return s.final();
}
@ -120,8 +117,6 @@ bool BladeRF1InputSettings::deserialize(const QByteArray& data)
d.readU32(16, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(17, &m_iqOrder);
d.readS32(18, &m_workspaceIndex, 0);
d.readBlob(19, &m_geometryBytes);
return true;
}

2
plugins/samplesource/bladerf1input/bladerf1inputsettings.h
View File

@ -48,8 +48,6 @@ struct BladeRF1InputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
BladeRF1InputSettings();
void resetToDefaults();

4
plugins/samplesource/bladerf2input/bladerf2inputgui.h
View File

@ -44,10 +44,6 @@ public:
virtual QByteArray serialize() const;
virtual bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::Bladerf2InputGui* ui;

5
plugins/samplesource/bladerf2input/bladerf2inputsettings.cpp
View File

@ -44,7 +44,6 @@ void BladeRF2InputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray BladeRF2InputSettings::serialize() const
@ -68,8 +67,6 @@ QByteArray BladeRF2InputSettings::serialize() const
s.writeU32(15, m_reverseAPIPort);
s.writeU32(16, m_reverseAPIDeviceIndex);
s.writeBool(17, m_iqOrder);
s.writeS32(18, m_workspaceIndex);
s.writeBlob(19, m_geometryBytes);
return s.final();
}
@ -115,8 +112,6 @@ bool BladeRF2InputSettings::deserialize(const QByteArray& data)
d.readU32(16, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(17, &m_iqOrder, true);
d.readS32(18, &m_workspaceIndex, 0);
d.readBlob(19, &m_geometryBytes);
return true;
}

2
plugins/samplesource/bladerf2input/bladerf2inputsettings.h
View File

@ -46,8 +46,6 @@ struct BladeRF2InputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
BladeRF2InputSettings();
void resetToDefaults();

4
plugins/samplesource/fcdpro/fcdprogui.h
View File

@ -45,10 +45,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::FCDProGui* ui;

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

@ -55,7 +55,6 @@ void FCDProSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray FCDProSettings::serialize() const
@ -90,8 +89,6 @@ QByteArray FCDProSettings::serialize() const
s.writeU32(26, m_reverseAPIPort);
s.writeU32(27, m_reverseAPIDeviceIndex);
s.writeBool(28, m_iqOrder);
s.writeS32(29, m_workspaceIndex);
s.writeBlob(30, m_geometryBytes);
return s.final();
}
@ -148,8 +145,6 @@ bool FCDProSettings::deserialize(const QByteArray& data)
d.readU32(27, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(28, &m_iqOrder, true);
d.readS32(29, &m_workspaceIndex, 0);
d.readBlob(30, &m_geometryBytes);
return true;
}

2
plugins/samplesource/fcdpro/fcdprosettings.h
View File

@ -56,8 +56,6 @@ struct FCDProSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
FCDProSettings();
void resetToDefaults();

4
plugins/samplesource/fcdproplus/fcdproplusgui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::FCDProPlusGui* ui;

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

@ -46,7 +46,6 @@ void FCDProPlusSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray FCDProPlusSettings::serialize() const
@ -71,8 +70,6 @@ QByteArray FCDProPlusSettings::serialize() const
s.writeU32(16, m_reverseAPIPort);
s.writeU32(17, m_reverseAPIDeviceIndex);
s.writeBool(18, m_iqOrder);
s.writeS32(19, m_workspaceIndex);
s.writeBlob(20, m_geometryBytes);
return s.final();
}
@ -119,8 +116,6 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data)
d.readU32(17, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(18, &m_iqOrder, true);
d.readS32(19, &m_workspaceIndex, 0);
d.readBlob(20, &m_geometryBytes);
return true;
}

2
plugins/samplesource/fcdproplus/fcdproplussettings.h
View File

@ -47,8 +47,6 @@ struct FCDProPlusSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
FCDProPlusSettings();
void resetToDefaults();

4
plugins/samplesource/fileinput/fileinputgui.h
View File

@ -46,10 +46,6 @@ public:
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual bool handleMessage(const Message& message);
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::FileInputGUI* ui;

5
plugins/samplesource/fileinput/fileinputsettings.cpp
View File

@ -36,7 +36,6 @@ void FileInputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray FileInputSettings::serialize() const
@ -49,8 +48,6 @@ QByteArray FileInputSettings::serialize() const
s.writeString(5, m_reverseAPIAddress);
s.writeU32(6, m_reverseAPIPort);
s.writeU32(7, m_reverseAPIDeviceIndex);
s.writeS32(8, m_workspaceIndex);
s.writeBlob(9, m_geometryBytes);
return s.final();
}
@ -83,8 +80,6 @@ bool FileInputSettings::deserialize(const QByteArray& data)
d.readU32(7, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(8, &m_workspaceIndex, 0);
d.readBlob(9, &m_geometryBytes);
return true;
}

2
plugins/samplesource/fileinput/fileinputsettings.h
View File

@ -29,8 +29,6 @@ struct FileInputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
static const unsigned int m_accelerationMaxScale; //!< Max power of 10 multiplier to 2,5,10 base ex: 2 -> 2,5,10,20,50,100,200,500,1000

4
plugins/samplesource/hackrfinput/hackrfinputgui.h
View File

@ -54,10 +54,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::HackRFInputGui* ui;

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

@ -48,7 +48,6 @@ void HackRFInputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray HackRFInputSettings::serialize() const
@ -74,8 +73,6 @@ QByteArray HackRFInputSettings::serialize() const
s.writeS64(19, m_transverterDeltaFrequency);
s.writeBool(20, m_iqOrder);
s.writeBool(21, m_autoBBF);
s.writeS32(22, m_workspaceIndex);
s.writeBlob(23, m_geometryBytes);
return s.final();
}
@ -123,8 +120,6 @@ bool HackRFInputSettings::deserialize(const QByteArray& data)
d.readS64(19, &m_transverterDeltaFrequency, 0);
d.readBool(20, &m_iqOrder, true);
d.readBool(21, &m_autoBBF, true);
d.readS32(22, &m_workspaceIndex, 0);
d.readBlob(23, &m_geometryBytes);
return true;
}

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

@ -48,8 +48,6 @@ struct HackRFInputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
HackRFInputSettings();
void resetToDefaults();

4
plugins/samplesource/kiwisdr/kiwisdrgui.h
View File

@ -46,10 +46,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::KiwiSDRGui* ui;

6
plugins/samplesource/kiwisdr/kiwisdrsettings.cpp
View File

@ -38,8 +38,6 @@ void KiwiSDRSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray KiwiSDRSettings::serialize() const
@ -49,8 +47,6 @@ QByteArray KiwiSDRSettings::serialize() const
s.writeString(2, m_serverAddress);
s.writeU32(3, m_gain);
s.writeBool(4, m_useAGC);
s.writeS32(5, m_workspaceIndex);
s.writeBlob(6, m_geometryBytes);
s.writeBool(100, m_useReverseAPI);
s.writeString(101, m_reverseAPIAddress);
@ -77,8 +73,6 @@ bool KiwiSDRSettings::deserialize(const QByteArray& data)
d.readString(2, &m_serverAddress, "127.0.0.1:8073");
d.readU32(3, &m_gain, 20);
d.readBool(4, &m_useAGC, true);
d.readS32(5, &m_workspaceIndex, 0);
d.readBlob(6, &m_geometryBytes);
d.readBool(100, &m_useReverseAPI, false);
d.readString(101, &m_reverseAPIAddress, "127.0.0.1");

3
plugins/samplesource/kiwisdr/kiwisdrsettings.h
View File

@ -35,9 +35,6 @@ struct KiwiSDRSettings {
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
KiwiSDRSettings();
void resetToDefaults();
QByteArray serialize() const;

4
plugins/samplesource/limesdrinput/limesdrinputgui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::LimeSDRInputGUI* ui;

5
plugins/samplesource/limesdrinput/limesdrinputsettings.cpp
View File

@ -53,7 +53,6 @@ void LimeSDRInputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray LimeSDRInputSettings::serialize() const
@ -87,8 +86,6 @@ QByteArray LimeSDRInputSettings::serialize() const
s.writeU32(26, m_reverseAPIPort);
s.writeU32(27, m_reverseAPIDeviceIndex);
s.writeBool(28, m_iqOrder);
s.writeS32(29, m_workspaceIndex);
s.writeBlob(30, m_geometryBytes);
return s.final();
}
@ -147,8 +144,6 @@ bool LimeSDRInputSettings::deserialize(const QByteArray& data)
d.readU32(27, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(28, &m_iqOrder, true);
d.readS32(29, &m_workspaceIndex, 0);
d.readBlob(20, &m_geometryBytes);
return true;
}

2
plugins/samplesource/limesdrinput/limesdrinputsettings.h
View File

@ -73,8 +73,6 @@ struct LimeSDRInputSettings
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
LimeSDRInputSettings();
void resetToDefaults();

4
plugins/samplesource/localinput/localinputgui.h
View File

@ -46,10 +46,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::LocalInputGui* ui;

5
plugins/samplesource/localinput/localinputsettings.cpp
View File

@ -31,7 +31,6 @@ void LocalInputSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray LocalInputSettings::serialize() const
@ -44,8 +43,6 @@ QByteArray LocalInputSettings::serialize() const
s.writeString(4, m_reverseAPIAddress);
s.writeU32(5, m_reverseAPIPort);
s.writeU32(6, m_reverseAPIDeviceIndex);
s.writeS32(7, m_workspaceIndex);
s.writeBlob(8, m_geometryBytes);
return s.final();
}
@ -78,8 +75,6 @@ bool LocalInputSettings::deserialize(const QByteArray& data)
d.readU32(6, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readS32(7, &m_workspaceIndex, 0);
d.readBlob(8, &m_geometryBytes);
return true;
}

2
plugins/samplesource/localinput/localinputsettings.h
View File

@ -28,8 +28,6 @@ struct LocalInputSettings {
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
LocalInputSettings();
void resetToDefaults();

4
plugins/samplesource/perseus/perseusgui.h
View File

@ -44,10 +44,6 @@ public:
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
uint32_t getDevSampleRate(unsigned int index);
int getDevSampleRateIndex(uint32_t sampleRate);

5
plugins/samplesource/perseus/perseussettings.cpp
View File

@ -41,7 +41,6 @@ void PerseusSettings::resetToDefaults()
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_workspaceIndex = 0;
}
QByteArray PerseusSettings::serialize() const
@ -62,8 +61,6 @@ QByteArray PerseusSettings::serialize() const
s.writeU32(12, m_reverseAPIPort);
s.writeU32(13, m_reverseAPIDeviceIndex);
s.writeBool(14, m_iqOrder);
s.writeS32(15, m_workspaceIndex);
s.writeBlob(16, m_geometryBytes);
return s.final();
}
@ -112,8 +109,6 @@ bool PerseusSettings::deserialize(const QByteArray& data)
d.readU32(13, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(14, &m_iqOrder, true);
d.readS32(15, &m_workspaceIndex, 0);
d.readBlob(16, &m_geometryBytes);
return true;
}

2
plugins/samplesource/perseus/perseussettings.h
View File

@ -47,8 +47,6 @@ struct PerseusSettings
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
int m_workspaceIndex;
QByteArray m_geometryBytes;
PerseusSettings();
void resetToDefaults();

4
plugins/samplesource/plutosdrinput/plutosdrinputgui.h
View File

@ -47,10 +47,6 @@ public:
virtual QByteArray serialize() const;
virtual bool deserialize(const QByteArray& data);
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
private:
Ui::PlutoSDRInputGUI* ui;

Some files were not shown because too many files have changed in this diff Show More