diff options
author | f4exb <f4exb06@gmail.com> | 2018-12-28 11:08:44 +0100 |
---|---|---|
committer | f4exb <f4exb06@gmail.com> | 2018-12-28 11:08:44 +0100 |
commit | 66efc10006501d452d0e828259f515c5d2b3d254 (patch) | |
tree | eb49c2befabcec6fe9638115ffbc3009bec51aef /plugins/channeltx/modwfm/wfmmodsettings.cpp | |
parent | 367c8a671ec1f2f22c555333559a957d20ba9985 (diff) | |
parent | 7ffe23fe81363cbe92fbf519a0f6950192180a49 (diff) |
Merge branch 'dev'v4.3.2
Diffstat (limited to 'plugins/channeltx/modwfm/wfmmodsettings.cpp')
-rw-r--r-- | plugins/channeltx/modwfm/wfmmodsettings.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/plugins/channeltx/modwfm/wfmmodsettings.cpp b/plugins/channeltx/modwfm/wfmmodsettings.cpp index 6f9f06873..ed8295773 100644 --- a/plugins/channeltx/modwfm/wfmmodsettings.cpp +++ b/plugins/channeltx/modwfm/wfmmodsettings.cpp @@ -49,6 +49,11 @@ void WFMModSettings::resetToDefaults() m_title = "WFM Modulator"; m_modAFInput = WFMModInputNone; m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName; + m_useReverseAPI = false; + m_reverseAPIAddress = "127.0.0.1"; + m_reverseAPIPort = 8888; + m_reverseAPIDeviceIndex = 0; + m_reverseAPIChannelIndex = 0; } QByteArray WFMModSettings::serialize() const @@ -74,6 +79,11 @@ QByteArray WFMModSettings::serialize() const s.writeString(10, m_title); s.writeString(11, m_audioDeviceName); s.writeS32(12, (int) m_modAFInput); + s.writeBool(13, m_useReverseAPI); + s.writeString(14, m_reverseAPIAddress); + s.writeU32(15, m_reverseAPIPort); + s.writeU32(16, m_reverseAPIDeviceIndex); + s.writeU32(17, m_reverseAPIChannelIndex); return s.final(); } @@ -92,6 +102,7 @@ bool WFMModSettings::deserialize(const QByteArray& data) { QByteArray bytetmp; qint32 tmp; + uint32_t utmp; d.readS32(1, &tmp, 0); m_inputFrequencyOffset = tmp; @@ -122,6 +133,21 @@ bool WFMModSettings::deserialize(const QByteArray& data) m_modAFInput = (WFMModInputAF) tmp; } + d.readBool(13, &m_useReverseAPI, false); + d.readString(14, &m_reverseAPIAddress, "127.0.0.1"); + d.readU32(15, &utmp, 0); + + if ((utmp > 1023) && (utmp < 65535)) { + m_reverseAPIPort = utmp; + } else { + m_reverseAPIPort = 8888; + } + + d.readU32(16, &utmp, 0); + m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp; + d.readU32(17, &utmp, 0); + m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp; + return true; } else |