From 2d010980b000f934db80ef7985f83fad1df2e259 Mon Sep 17 00:00:00 2001 From: vladest Date: Thu, 12 Oct 2017 19:15:09 +0200 Subject: [PATCH] Removed special sound for Mute and replace it with hover and click sounds --- interface/resources/qml/hifi/audio/MicBar.qml | 12 +++++++++++- scripts/system/dialTone.js | 6 ------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/interface/resources/qml/hifi/audio/MicBar.qml b/interface/resources/qml/hifi/audio/MicBar.qml index e757d7cadf..81903111c0 100644 --- a/interface/resources/qml/hifi/audio/MicBar.qml +++ b/interface/resources/qml/hifi/audio/MicBar.qml @@ -14,6 +14,8 @@ import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 +import TabletScriptingInterface 1.0 + Rectangle { readonly property var level: Audio.inputLevel; @@ -57,8 +59,16 @@ Rectangle { hoverEnabled: true; scrollGestureEnabled: false; - onClicked: { Audio.muted = !Audio.muted; } + onClicked: { + Audio.muted = !Audio.muted; + tabletInterface.playSound(TabletEnums.ButtonClick) + } drag.target: dragTarget; + onContainsMouseChanged: { + if (containsMouse) { + tabletInterface.playSound(TabletEnums.ButtonHover) + } + } } QtObject { diff --git a/scripts/system/dialTone.js b/scripts/system/dialTone.js index 7b693aa2de..7c0a5b250d 100644 --- a/scripts/system/dialTone.js +++ b/scripts/system/dialTone.js @@ -33,10 +33,4 @@ Audio.disconnected.connect(function(){ Audio.playSound(disconnectSound, soundOptions); }); -Audio.mutedChanged.connect(function () { - if (Audio.muted) { - Audio.playSound(micMutedSound, soundOptions); - } -}); - }()); // END LOCAL_SCOPE