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

Removed obsolete fields of Preferences class

Browse Source
This commit is contained in:
f4exb 2019-07-31 23:56:23 +02:00
parent fbdb72ceb4
commit 9588d53327
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdrbase/settings/preferences.cpp
View File

@ -8,7 +8,6 @@ Preferences::Preferences()
void Preferences::resetToDefaults() void Preferences::resetToDefaults()
{ {
m_sourceType.clear();
m_sourceDevice.clear(); m_sourceDevice.clear();
m_audioType.clear(); m_audioType.clear();
m_audioDevice.clear(); m_audioDevice.clear();
@ -24,7 +23,6 @@ void Preferences::resetToDefaults()
QByteArray Preferences::serialize() const QByteArray Preferences::serialize() const
{ {
SimpleSerializer s(1); SimpleSerializer s(1);
s.writeString(1, m_sourceType);
s.writeString(2, m_sourceDevice); s.writeString(2, m_sourceDevice);
s.writeString(3, m_audioType); s.writeString(3, m_audioType);
s.writeString(4, m_audioDevice); s.writeString(4, m_audioDevice);
@ -51,7 +49,6 @@ bool Preferences::deserialize(const QByteArray& data)
if(d.getVersion() == 1) if(d.getVersion() == 1)
{ {
d.readString(1, &m_sourceType);
d.readString(2, &m_sourceDevice); d.readString(2, &m_sourceDevice);
d.readString(3, &m_audioType); d.readString(3, &m_audioType);
d.readString(4, &m_audioDevice); d.readString(4, &m_audioDevice);

7
sdrbase/settings/preferences.h
View File

@ -13,8 +13,6 @@ public:
QByteArray serialize() const; QByteArray serialize() const;
bool deserialize(const QByteArray& data); bool deserialize(const QByteArray& data);
void setSourceType(const QString& value) { m_sourceType = value; }
const QString& getSourceType() const { return m_sourceType; }
void setSourceDevice(const QString& value) { m_sourceDevice= value; } void setSourceDevice(const QString& value) { m_sourceDevice= value; }
const QString& getSourceDevice() const { return m_sourceDevice; } const QString& getSourceDevice() const { return m_sourceDevice; }
void setSourceIndex(const int value) { m_sourceIndex = value; } void setSourceIndex(const int value) { m_sourceIndex = value; }
@ -40,9 +38,8 @@ public:
const QString& getLogFileName() const { return m_logFileName; } const QString& getLogFileName() const { return m_logFileName; }
protected: protected:
QString m_sourceType; QString m_sourceDevice; //!< Identification of the source used in R0 tab (GUI flavor) at startup
QString m_sourceDevice; int m_sourceIndex; //!< Index of the source used in R0 tab (GUI flavor) at startup
int m_sourceIndex;
QString m_audioType; QString m_audioType;
QString m_audioDevice; QString m_audioDevice;

8
swagger/sdrangel/api/swagger/include/Preferences.yaml
View File

@ -1,16 +1,16 @@
Preferences: Preferences:
description: Repreents a Prefernce object description: Repreents a Prefernce object
properties: properties:
sourceType:
type: string
sourceDevice: sourceDevice:
description: Identification of the source used in R0 tab (GUI flavor) at startup
type: string type: string
sourceIndex:
description: Index of the source used in R0 tab (GUI flavor) at startup
type: integer
audioType: audioType:
type: string type: string
audioDevice: audioDevice:
type: string type: string
sourceIndex:
type: integer
latitude: latitude:
type: number type: number
format: float format: float