Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 20:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pretty sure about this now

Browse source
This commit is contained in:
Zach Fox 2017-03-24 13:05:07 -07:00
parent e5741869e5
commit 31ae326880
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/system/selectAudioDevice.js
View file

@ -95,6 +95,7 @@ function setupAudioMenus() {
audioDevicesList.push(menuItem); audioDevicesList.push(menuItem);
if (thisDeviceSelected) { if (thisDeviceSelected) {
selectedInputMenu = menuItem; selectedInputMenu = menuItem;
print("selectAudioDevice: selectedInputMenu: " + selectedInputMenu);
} }
} }
@ -120,6 +121,7 @@ function setupAudioMenus() {
audioDevicesList.push(menuItem); audioDevicesList.push(menuItem);
if (thisDeviceSelected) { if (thisDeviceSelected) {
selectedOutputMenu = menuItem; selectedOutputMenu = menuItem;
print("selectAudioDevice: selectedOutputMenu: " + selectedOutputMenu);
} }
} }
if (!menuConnected) { if (!menuConnected) {
@ -180,9 +182,6 @@ function switchAudioDevice(isInput, device) {
if (isInput) { if (isInput) {
print("selectAudioDevice: Switching audio INPUT device to:", device); print("selectAudioDevice: Switching audio INPUT device to:", device);
if (AudioDevice.setInputDevice(device)) { if (AudioDevice.setInputDevice(device)) {
Menu.setIsOptionChecked(selectedInputMenu, false);
selectedInputMenu = "Use " + device + " for Input";
Menu.setIsOptionChecked(selectedInputMenu, true);
Settings.setValue(INPUT_DEVICE_SETTING, device); Settings.setValue(INPUT_DEVICE_SETTING, device);
} else { } else {
print("selectAudioDevice: Error setting audio input device!") print("selectAudioDevice: Error setting audio input device!")
@ -190,14 +189,12 @@ function switchAudioDevice(isInput, device) {
} else { } else {
print("selectAudioDevice: Switching audio OUTPUT device to:", device); print("selectAudioDevice: Switching audio OUTPUT device to:", device);
if (AudioDevice.setOutputDevice(device)) { if (AudioDevice.setOutputDevice(device)) {
Menu.setIsOptionChecked(selectedOutputMenu, false);
selectedOutputMenu = "Use " + device + " for Output";
Menu.setIsOptionChecked(selectedOutputMenu, true);
Settings.setValue(OUTPUT_DEVICE_SETTING, device); Settings.setValue(OUTPUT_DEVICE_SETTING, device);
} else { } else {
print("selectAudioDevice: Error setting audio output device!") print("selectAudioDevice: Error setting audio output device!")
} }
} }
setupAudioMenus();
if (!menuConnected) { if (!menuConnected) {
Menu.menuItemEvent.connect(menuItemEvent); Menu.menuItemEvent.connect(menuItemEvent);
menuConnected = true; menuConnected = true;
@ -218,6 +215,10 @@ function restoreAudio() {
} }
function checkHMDAudio() { function checkHMDAudio() {
if (menuConnected) {
Menu.menuItemEvent.disconnect(menuItemEvent);
menuConnected = false;
}
// HMD Active state is changing; handle switching // HMD Active state is changing; handle switching
if (HMD.active != wasHmdActive) { if (HMD.active != wasHmdActive) {
print("selectAudioDevice: HMD Active state changed!"); print("selectAudioDevice: HMD Active state changed!");
@ -256,6 +257,10 @@ function checkHMDAudio() {
} }
} }
wasHmdActive = HMD.active; wasHmdActive = HMD.active;
if (!menuConnected) {
Menu.menuItemEvent.connect(menuItemEvent);
menuConnected = true;
}
} }
/**************************************** /****************************************
END FUNCTION DEFINITIONS END FUNCTION DEFINITIONS
@ -269,10 +274,11 @@ Script.setTimeout(function () {
print("selectAudioDevice: Connecting deviceChanged() and displayModeChanged()"); print("selectAudioDevice: Connecting deviceChanged() and displayModeChanged()");
AudioDevice.deviceChanged.connect(onDevicechanged); AudioDevice.deviceChanged.connect(onDevicechanged);
HMD.displayModeChanged.connect(checkHMDAudio); HMD.displayModeChanged.connect(checkHMDAudio);
print ("selectAudioDevice: Checking HMD audio status...")
checkHMDAudio();
print("selectAudioDevice: Setting up Audio > Devices menu for the first time"); print("selectAudioDevice: Setting up Audio > Devices menu for the first time");
setupAudioMenus(); setupAudioMenus();
checkHMDAudio(); }, 3000);
}, 5000);
print("selectAudioDevice: Connecting menuItemEvent() and scriptEnding()"); print("selectAudioDevice: Connecting menuItemEvent() and scriptEnding()");
Menu.menuItemEvent.connect(menuItemEvent); Menu.menuItemEvent.connect(menuItemEvent);