Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 15:56:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

real fix

Browse source
This commit is contained in:
Wayne Chen 2019-04-18 14:46:08 -07:00
parent 5baf2f21d8
commit da8f8e0873
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -174,9 +174,11 @@ void Audio::setPTTDesktop(bool enabled) {
_pttDesktop = enabled; _pttDesktop = enabled;
} }
}); });
if (!enabled && _settingsLoaded) { if (!enabled) {
// Set to default behavior (unmuted for Desktop) on Push-To-Talk disable. if (_settingsLoaded) {
setMutedDesktop(true); // Set to default behavior (unmuted for Desktop) on Push-To-Talk disable.
setMutedDesktop(true);
}
} else { } else {
// Should be muted when not pushing to talk while PTT is enabled. // Should be muted when not pushing to talk while PTT is enabled.
setMutedDesktop(true); setMutedDesktop(true);
@ -202,9 +204,11 @@ void Audio::setPTTHMD(bool enabled) {
_pttHMD = enabled; _pttHMD = enabled;
} }
}); });
if (!enabled && _settingsLoaded) { if (!enabled) {
// Set to default behavior (unmuted for HMD) on Push-To-Talk disable. if (_settingsLoaded) {
setMutedHMD(false); // Set to default behavior (unmuted for HMD) on Push-To-Talk disable.
setMutedHMD(false);
}
} else { } else {
// Should be muted when not pushing to talk while PTT is enabled. // Should be muted when not pushing to talk while PTT is enabled.
setMutedHMD(true); setMutedHMD(true);
@ -358,11 +362,6 @@ void Audio::onContextChanged() {
changed = true; changed = true;
} }
}); });
if (isHMD) {
setMuted(getMutedHMD());
} else {
setMuted(getMutedDesktop());
}
if (changed) { if (changed) {
emit contextChanged(isHMD ? Audio::HMD : Audio::DESKTOP); emit contextChanged(isHMD ? Audio::HMD : Audio::DESKTOP);
} }