diff --git a/plugins/channeltx/modam/ammodsettings.cpp b/plugins/channeltx/modam/ammodsettings.cpp index 307f1e463..a16d47082 100644 --- a/plugins/channeltx/modam/ammodsettings.cpp +++ b/plugins/channeltx/modam/ammodsettings.cpp @@ -44,6 +44,7 @@ void AMModSettings::resetToDefaults() m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackAudioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackVolumeFactor = 1.0f; + m_feedbackAudioEnable = false; m_useReverseAPI = false; m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; @@ -80,6 +81,7 @@ QByteArray AMModSettings::serialize() const s.writeU32(16, m_reverseAPIChannelIndex); s.writeString(17, m_feedbackAudioDeviceName); s.writeReal(18, m_feedbackVolumeFactor); + s.writeBool(19, m_feedbackAudioEnable); return s.final(); } @@ -144,6 +146,7 @@ bool AMModSettings::deserialize(const QByteArray& data) m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp; d.readString(17, &m_feedbackAudioDeviceName, AudioDeviceManager::m_defaultDeviceName); d.readReal(18, &m_feedbackVolumeFactor, 1.0); + d.readBool(19, &m_feedbackAudioEnable, false); return true; } diff --git a/plugins/channeltx/modam/ammodsettings.h b/plugins/channeltx/modam/ammodsettings.h index dcca41476..3b9c4cd6a 100644 --- a/plugins/channeltx/modam/ammodsettings.h +++ b/plugins/channeltx/modam/ammodsettings.h @@ -46,6 +46,7 @@ struct AMModSettings QString m_audioDeviceName; //!< This is the audio device you get the audio samples from QString m_feedbackAudioDeviceName; //!< This is the audio device you send the audio samples to for audio feedback float m_feedbackVolumeFactor; + bool m_feedbackAudioEnable; bool m_useReverseAPI; QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; diff --git a/plugins/channeltx/modfreedv/freedvmodsettings.cpp b/plugins/channeltx/modfreedv/freedvmodsettings.cpp index 91a8ce00e..7274e571f 100644 --- a/plugins/channeltx/modfreedv/freedvmodsettings.cpp +++ b/plugins/channeltx/modfreedv/freedvmodsettings.cpp @@ -44,6 +44,7 @@ void FreeDVModSettings::resetToDefaults() m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackAudioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackVolumeFactor = 1.0f; + m_feedbackAudioEnable = false; m_freeDVMode = FreeDVMode::FreeDVMode2400A; m_gaugeInputElseModem = false; m_useReverseAPI = false; @@ -88,6 +89,7 @@ QByteArray FreeDVModSettings::serialize() const s.writeU32(26, m_reverseAPIChannelIndex); s.writeString(27, m_feedbackAudioDeviceName); s.writeReal(28, m_feedbackVolumeFactor); + s.writeBool(29, m_feedbackAudioEnable); return s.final(); } @@ -168,6 +170,7 @@ bool FreeDVModSettings::deserialize(const QByteArray& data) m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp; d.readString(27, &m_feedbackAudioDeviceName, AudioDeviceManager::m_defaultDeviceName); d.readReal(28, &m_feedbackVolumeFactor, 1.0); + d.readBool(29, &m_feedbackAudioEnable, false); return true; } diff --git a/plugins/channeltx/modfreedv/freedvmodsettings.h b/plugins/channeltx/modfreedv/freedvmodsettings.h index 6b4cb2d37..29b18e178 100644 --- a/plugins/channeltx/modfreedv/freedvmodsettings.h +++ b/plugins/channeltx/modfreedv/freedvmodsettings.h @@ -57,6 +57,7 @@ struct FreeDVModSettings QString m_audioDeviceName; QString m_feedbackAudioDeviceName; //!< This is the audio device you send the audio samples to for audio feedback float m_feedbackVolumeFactor; + bool m_feedbackAudioEnable; FreeDVMode m_freeDVMode; bool m_gaugeInputElseModem; //!< Volume gauge shows speech input level else modem level diff --git a/plugins/channeltx/modnfm/nfmmodsettings.cpp b/plugins/channeltx/modnfm/nfmmodsettings.cpp index eb6ba1b8d..ac197720e 100644 --- a/plugins/channeltx/modnfm/nfmmodsettings.cpp +++ b/plugins/channeltx/modnfm/nfmmodsettings.cpp @@ -62,6 +62,7 @@ void NFMModSettings::resetToDefaults() m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackAudioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackVolumeFactor = 1.0f; + m_feedbackAudioEnable = false; m_useReverseAPI = false; m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; @@ -101,6 +102,7 @@ QByteArray NFMModSettings::serialize() const s.writeU32(19, m_reverseAPIChannelIndex); s.writeString(20, m_feedbackAudioDeviceName); s.writeReal(21, m_feedbackVolumeFactor); + s.writeBool(22, m_feedbackAudioEnable); return s.final(); } @@ -170,6 +172,7 @@ bool NFMModSettings::deserialize(const QByteArray& data) m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp; d.readString(20, &m_feedbackAudioDeviceName, AudioDeviceManager::m_defaultDeviceName); d.readReal(21, &m_feedbackVolumeFactor, 1.0); + d.readBool(22, &m_feedbackAudioEnable, false); return true; } diff --git a/plugins/channeltx/modnfm/nfmmodsettings.h b/plugins/channeltx/modnfm/nfmmodsettings.h index f0a78191f..780db9428 100644 --- a/plugins/channeltx/modnfm/nfmmodsettings.h +++ b/plugins/channeltx/modnfm/nfmmodsettings.h @@ -54,6 +54,7 @@ struct NFMModSettings QString m_audioDeviceName; //!< This is the audio device you get the audio samples from QString m_feedbackAudioDeviceName; //!< This is the audio device you send the audio samples to for audio feedback float m_feedbackVolumeFactor; + bool m_feedbackAudioEnable; bool m_useReverseAPI; QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; diff --git a/plugins/channeltx/modssb/ssbmodsettings.cpp b/plugins/channeltx/modssb/ssbmodsettings.cpp index da4729bdb..812700e1a 100644 --- a/plugins/channeltx/modssb/ssbmodsettings.cpp +++ b/plugins/channeltx/modssb/ssbmodsettings.cpp @@ -65,6 +65,7 @@ void SSBModSettings::resetToDefaults() m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackAudioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackVolumeFactor = 1.0f; + m_feedbackAudioEnable = false; m_useReverseAPI = false; m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; @@ -111,6 +112,7 @@ QByteArray SSBModSettings::serialize() const s.writeU32(26, m_reverseAPIChannelIndex); s.writeString(27, m_feedbackAudioDeviceName); s.writeReal(28, m_feedbackVolumeFactor); + s.writeBool(29, m_feedbackAudioEnable); return s.final(); } @@ -194,6 +196,7 @@ bool SSBModSettings::deserialize(const QByteArray& data) m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp; d.readString(27, &m_feedbackAudioDeviceName, AudioDeviceManager::m_defaultDeviceName); d.readReal(28, &m_feedbackVolumeFactor, 1.0); + d.readBool(29, &m_feedbackAudioEnable, false); return true; } diff --git a/plugins/channeltx/modssb/ssbmodsettings.h b/plugins/channeltx/modssb/ssbmodsettings.h index fe9d9b295..445737425 100644 --- a/plugins/channeltx/modssb/ssbmodsettings.h +++ b/plugins/channeltx/modssb/ssbmodsettings.h @@ -58,6 +58,7 @@ struct SSBModSettings QString m_audioDeviceName; //!< This is the audio device you get the audio samples from QString m_feedbackAudioDeviceName; //!< This is the audio device you send the audio samples to for audio feedback float m_feedbackVolumeFactor; + bool m_feedbackAudioEnable; bool m_useReverseAPI; QString m_reverseAPIAddress; diff --git a/plugins/channeltx/modwfm/wfmmodsettings.cpp b/plugins/channeltx/modwfm/wfmmodsettings.cpp index 088486ec9..2b6bb869d 100644 --- a/plugins/channeltx/modwfm/wfmmodsettings.cpp +++ b/plugins/channeltx/modwfm/wfmmodsettings.cpp @@ -52,6 +52,7 @@ void WFMModSettings::resetToDefaults() m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackAudioDeviceName = AudioDeviceManager::m_defaultDeviceName; m_feedbackVolumeFactor = 1.0f; + m_feedbackAudioEnable = false; m_useReverseAPI = false; m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; @@ -89,6 +90,7 @@ QByteArray WFMModSettings::serialize() const s.writeU32(17, m_reverseAPIChannelIndex); s.writeString(18, m_feedbackAudioDeviceName); s.writeReal(19, m_feedbackVolumeFactor); + s.writeBool(20, m_feedbackAudioEnable); return s.final(); } @@ -154,6 +156,7 @@ bool WFMModSettings::deserialize(const QByteArray& data) m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp; d.readString(18, &m_feedbackAudioDeviceName, AudioDeviceManager::m_defaultDeviceName); d.readReal(19, &m_feedbackVolumeFactor, 1.0); + d.readBool(20, &m_feedbackAudioEnable, false); return true; } diff --git a/plugins/channeltx/modwfm/wfmmodsettings.h b/plugins/channeltx/modwfm/wfmmodsettings.h index a21e5832d..6501bb821 100644 --- a/plugins/channeltx/modwfm/wfmmodsettings.h +++ b/plugins/channeltx/modwfm/wfmmodsettings.h @@ -50,6 +50,7 @@ struct WFMModSettings QString m_audioDeviceName; //!< This is the audio device you get the audio samples from QString m_feedbackAudioDeviceName; //!< This is the audio device you send the audio samples to for audio feedback float m_feedbackVolumeFactor; + bool m_feedbackAudioEnable; bool m_useReverseAPI; QString m_reverseAPIAddress; uint16_t m_reverseAPIPort;