From 73db19464f5cd7f7593c08f97f66ca6fb7f6c071 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 1 Jul 2019 11:28:48 -0700 Subject: [PATCH] DEV-194: Iterate on PTT Ducking Slider design --- .../simplifiedUI/settingsApp/audio/Audio.qml | 27 ------------------- interface/src/scripting/Audio.h | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml index ec211fd2f5..8827bb3834 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml @@ -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); - } - } - } } } diff --git a/interface/src/scripting/Audio.h b/interface/src/scripting/Audio.h index 9173a4b4eb..d62fd70cc4 100644 --- a/interface/src/scripting/Audio.h +++ b/interface/src/scripting/Audio.h @@ -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 };