Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-07 14:39:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16089 from RebeccaStankus/MuteIssues

Browse source 
Push To Talk Bugs 1207/1208
This commit is contained in:
Shannon Romano 2019-08-23 10:42:16 -07:00 committed by GitHub
commit 86518d222d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/qml/hifi/audio/Audio.qml
View file

@ -186,15 +186,6 @@ Rectangle {
backgroundOnColor: "#E3E3E3"; backgroundOnColor: "#E3E3E3";
checked: muted; checked: muted;
onClicked: { onClicked: {
if (pushToTalk && !checked) {
// disable push to talk if unmuting
if (bar.currentIndex === 0) {
AudioScriptingInterface.pushToTalkDesktop = false;
}
else {
AudioScriptingInterface.pushToTalkHMD = false;
}
}
if (bar.currentIndex === 0) { if (bar.currentIndex === 0) {
AudioScriptingInterface.mutedDesktop = checked; AudioScriptingInterface.mutedDesktop = checked;
} }

14
interface/src/scripting/Audio.cpp
View file

@ -101,6 +101,10 @@ void Audio::setMutedDesktop(bool isMuted) {
} }
} }
}); });
if (!isMuted && _settingsLoaded) {
// Disable Push-To-Talk if muted is changed to false. Settings also need to be loaded.
setPTTDesktop(isMuted);
}
if (changed) { if (changed) {
if (!isHMD) { if (!isHMD) {
emit mutedChanged(isMuted); emit mutedChanged(isMuted);
@ -128,6 +132,10 @@ void Audio::setMutedHMD(bool isMuted) {
} }
} }
}); });
if (!isMuted && _settingsLoaded) {
// Disable Push-To-Talk if muted is changed to false. Settings also need to be loaded.
setPTTHMD(isMuted);
}
if (changed) { if (changed) {
if (isHMD) { if (isHMD) {
emit mutedChanged(isMuted); emit mutedChanged(isMuted);
@ -187,9 +195,9 @@ void Audio::setPTTDesktop(bool enabled) {
_pttDesktop = enabled; _pttDesktop = enabled;
} }
}); });
if (enabled || _settingsLoaded) { if (enabled && _settingsLoaded) {
// Set to default behavior (muted for Desktop) on Push-To-Talk disable or when enabled. Settings also need to be loaded. // Set to default behavior (muted for Desktop) on Push-To-Talk disable or when enabled. Settings also need to be loaded.
setMutedDesktop(true); setMutedDesktop(enabled);
} }
if (changed) { if (changed) {
emit pushToTalkChanged(enabled); emit pushToTalkChanged(enabled);
@ -211,7 +219,7 @@ void Audio::setPTTHMD(bool enabled) {
_pttHMD = enabled; _pttHMD = enabled;
} }
}); });
if (enabled || _settingsLoaded) { if (enabled && _settingsLoaded) {
// Set to default behavior (unmuted for HMD) on Push-To-Talk disable or muted for when PTT is enabled. // Set to default behavior (unmuted for HMD) on Push-To-Talk disable or muted for when PTT is enabled.
setMutedHMD(enabled); setMutedHMD(enabled);
} }