mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-05 07:24:44 -04:00
Make rollup state a serializable object so that it can be dumped in JSON format for the API. Prerequisite tp #1050
This commit is contained in:
@@ -25,7 +25,8 @@
|
||||
|
||||
MESSAGE_CLASS_DEFINITION(RigCtlServerSettings::MsgChannelIndexChange, Message)
|
||||
|
||||
RigCtlServerSettings::RigCtlServerSettings()
|
||||
RigCtlServerSettings::RigCtlServerSettings() :
|
||||
m_rollupState(nullptr)
|
||||
{
|
||||
resetToDefaults();
|
||||
}
|
||||
@@ -60,7 +61,10 @@ QByteArray RigCtlServerSettings::serialize() const
|
||||
s.writeU32(9, m_reverseAPIPort);
|
||||
s.writeU32(10, m_reverseAPIFeatureSetIndex);
|
||||
s.writeU32(11, m_reverseAPIFeatureIndex);
|
||||
s.writeBlob(12, m_rollupState);
|
||||
|
||||
if (m_rollupState) {
|
||||
s.writeBlob(12, m_rollupState->serialize());
|
||||
}
|
||||
|
||||
return s.final();
|
||||
}
|
||||
@@ -108,7 +112,12 @@ bool RigCtlServerSettings::deserialize(const QByteArray& data)
|
||||
m_reverseAPIFeatureSetIndex = utmp > 99 ? 99 : utmp;
|
||||
d.readU32(11, &utmp, 0);
|
||||
m_reverseAPIFeatureIndex = utmp > 99 ? 99 : utmp;
|
||||
d.readBlob(12, &m_rollupState);
|
||||
|
||||
if (m_rollupState)
|
||||
{
|
||||
d.readBlob(12, &bytetmp);
|
||||
m_rollupState->deserialize(bytetmp);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user