Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15858 from zfox23/PTTDuckingSlider

Browse source 
DEV-194: Iterate on PTT Ducking Slider design
This commit is contained in:
Zach Fox 2019-07-01 12:00:17 -07:00 committed by GitHub
commit b8485361ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
View file

@ -222,33 +222,6 @@ Flickable {
}
}
}
SimplifiedControls.Slider {
id: muteOutputSlider
enabled: AudioScriptingInterface.pushToTalkDesktop && attenuateOutputSwitch.checked
Layout.preferredWidth: parent.width
Layout.preferredHeight: 18
labelText: "Amount to reduce"
from: 0.0
to: 60.0
defaultValue: 20.0
stepSize: 5.0
value: -1 * AudioScriptingInterface.pushingToTalkOutputGainDesktop
live: true
function updatePushingToTalkOutputGainDesktop(newValue) {
if (AudioScriptingInterface.pushingToTalkOutputGainDesktop !== newValue) {
AudioScriptingInterface.pushingToTalkOutputGainDesktop = newValue;
}
}
onValueChanged: {
updatePushingToTalkOutputGainDesktop(-1 * value);
}
onPressedChanged: {
if (!pressed) {
updatePushingToTalkOutputGainDesktop(-1 * value);
}
}
}
}
}

2
interface/src/scripting/Audio.h
View file

@ -508,7 +508,7 @@ private:
float _inputLevel { 0.0f };
float _localInjectorGain { 0.0f }; // in dB
float _systemInjectorGain { 0.0f }; // in dB
float _pttOutputGainDesktop { -20.0f }; // in dB
float _pttOutputGainDesktop { 0.0f }; // in dB
bool _isClipping { false };
bool _enableNoiseReduction { true }; // Match default value of AudioClient::_isNoiseGateEnabled.
bool _enableWarnWhenMuted { true };