Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 20:36:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

delay 200ms to avoid recursive audio dev switches

Browse source
This commit is contained in:
Zach Pomerantz 2017-03-29 19:03:05 -04:00
parent c30ab4de8b
commit 4a9fbf2bbd
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
scripts/system/selectAudioDevice.js
View file

@ -42,6 +42,7 @@ var switchedAudioInputToHMD = false;
var switchedAudioOutputToHMD = false; var switchedAudioOutputToHMD = false;
var previousSelectedInputAudioDevice = ""; var previousSelectedInputAudioDevice = "";
var previousSelectedOutputAudioDevice = ""; var previousSelectedOutputAudioDevice = "";
var skipMenuEvents = true;
// //
// BEGIN FUNCTION DEFINITIONS // BEGIN FUNCTION DEFINITIONS
@ -54,7 +55,9 @@ function debug() {
function setupAudioMenus() { function setupAudioMenus() {
Menu.menuItemEvent.disconnect(switchAudioDevice); // menu events can be triggered asynchronously; skip them for 200ms to avoid recursion and false switches
skipMenuEvents = true;
Script.setTimeout(function() { skipMenuEvents = false; }, 200);
removeAudioMenus(); removeAudioMenus();
@ -85,8 +88,6 @@ function setupAudioMenus() {
}); });
audioDevicesList.push(audioDeviceMenuString); audioDevicesList.push(audioDeviceMenuString);
} }
Menu.menuItemEvent.connect(switchAudioDevice);
} }
function checkDeviceMismatch() { function checkDeviceMismatch() {
@ -126,19 +127,30 @@ function onDevicechanged() {
checkDeviceMismatch(); checkDeviceMismatch();
} }
function onMenuEvent(audioDeviceMenuString) {
if (!skipMenuEvents) {
switchAudioDevice(audioDeviceMenuString);
}
}
function switchAudioDevice(audioDeviceMenuString) { function switchAudioDevice(audioDeviceMenuString) {
// if the device is not plugged in, short-circuit // if the device is not plugged in, short-circuit
if (!~audioDevicesList.indexOf(audioDeviceMenuString)) { if (!~audioDevicesList.indexOf(audioDeviceMenuString)) {
return; return;
} }
Menu.menuItemEvent.disconnect(switchAudioDevice);
var selection = parseMenuItem(audioDeviceMenuString); var selection = parseMenuItem(audioDeviceMenuString);
if (!selection) { if (!selection) {
debug("Invalid Audio audioDeviceMenuString! Doesn't end with 'for Input' or 'for Output'") debug("Invalid Audio audioDeviceMenuString! Doesn't end with 'for Input' or 'for Output'");
} else if (selection.mode == INPUT) { return;
var selectedDevice = selection.device; }
// menu events can be triggered asynchronously; skip them for 200ms to avoid recursion and false switches
skipMenuEvents = true;
Script.setTimeout(function() { skipMenuEvents = false; }, 200);
var selectedDevice = selection.device;
if (selection.mode == INPUT) {
var currentInputDevice = AudioDevice.getInputDevice(); var currentInputDevice = AudioDevice.getInputDevice();
if (selectedDevice != currentInputDevice) { if (selectedDevice != currentInputDevice) {
debug("Switching audio INPUT device from " + currentInputDevice + " to " + selectedDevice); debug("Switching audio INPUT device from " + currentInputDevice + " to " + selectedDevice);
@ -157,7 +169,6 @@ function switchAudioDevice(audioDeviceMenuString) {
AudioDevice.setInputDevice(selectedDevice); // Still try to force-set the device (in case the user's trying to forcefully debug an issue) AudioDevice.setInputDevice(selectedDevice); // Still try to force-set the device (in case the user's trying to forcefully debug an issue)
} }
} else if (selection.mode == OUTPUT) { } else if (selection.mode == OUTPUT) {
var selectedDevice = selection.device;
var currentOutputDevice = AudioDevice.getOutputDevice(); var currentOutputDevice = AudioDevice.getOutputDevice();
if (selectedDevice != currentOutputDevice) { if (selectedDevice != currentOutputDevice) {
debug("Switching audio OUTPUT device from " + currentOutputDevice + " to " + selectedDevice); debug("Switching audio OUTPUT device from " + currentOutputDevice + " to " + selectedDevice);
@ -176,8 +187,6 @@ function switchAudioDevice(audioDeviceMenuString) {
AudioDevice.setOutputDevice(selectedDevice); // Still try to force-set the device (in case the user's trying to forcefully debug an issue) AudioDevice.setOutputDevice(selectedDevice); // Still try to force-set the device (in case the user's trying to forcefully debug an issue)
} }
} }
Menu.menuItemEvent.connect(switchAudioDevice);
} }
function restoreAudio() { function restoreAudio() {
@ -234,6 +243,7 @@ function checkHMDAudio() {
} }
wasHmdActive = HMD.active; wasHmdActive = HMD.active;
} }
// //
// END FUNCTION DEFINITIONS // END FUNCTION DEFINITIONS
// //
@ -246,7 +256,7 @@ Script.setTimeout(function () {
debug("Connecting deviceChanged(), displayModeChanged(), and switchAudioDevice()..."); debug("Connecting deviceChanged(), displayModeChanged(), and switchAudioDevice()...");
AudioDevice.deviceChanged.connect(onDevicechanged); AudioDevice.deviceChanged.connect(onDevicechanged);
HMD.displayModeChanged.connect(checkHMDAudio); HMD.displayModeChanged.connect(checkHMDAudio);
Menu.menuItemEvent.connect(switchAudioDevice); Menu.menuItemEvent.connect(onMenuEvent);
debug("Setting up Audio I/O menu for the first time..."); debug("Setting up Audio I/O menu for the first time...");
setupAudioMenus(); setupAudioMenus();
checkDeviceMismatch(); checkDeviceMismatch();
@ -258,7 +268,7 @@ debug("Connecting scriptEnding()");
Script.scriptEnding.connect(function () { Script.scriptEnding.connect(function () {
restoreAudio(); restoreAudio();
removeAudioMenus(); removeAudioMenus();
Menu.menuItemEvent.disconnect(switchAudioDevice); Menu.menuItemEvent.disconnect(onMenuEvent);
HMD.displayModeChanged.disconnect(checkHMDAudio); HMD.displayModeChanged.disconnect(checkHMDAudio);
AudioDevice.deviceChanged.disconnect(onDevicechanged); AudioDevice.deviceChanged.disconnect(onDevicechanged);
}); });