VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Audio modulators audio feedback: added enable flag in the settings

This commit is contained in:
f4exb 2019-07-30 19:42:44 +02:00
parent ac9704fda5
commit 1ac701f01b
10 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/channeltx/modam/ammodsettings.cpp
View File

@ -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;
}

1
plugins/channeltx/modam/ammodsettings.h
View File

@ -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;

3
plugins/channeltx/modfreedv/freedvmodsettings.cpp
View File

@ -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;
}

1
plugins/channeltx/modfreedv/freedvmodsettings.h
View File

@ -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

3
plugins/channeltx/modnfm/nfmmodsettings.cpp
View File

@ -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;
}

1
plugins/channeltx/modnfm/nfmmodsettings.h
View File

@ -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;

3
plugins/channeltx/modssb/ssbmodsettings.cpp
View File

@ -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;
}

1
plugins/channeltx/modssb/ssbmodsettings.h
View File

@ -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;

3
plugins/channeltx/modwfm/wfmmodsettings.cpp
View File

@ -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;
}

1
plugins/channeltx/modwfm/wfmmodsettings.h
View File

@ -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;