Merge pull request #10817 from kencooke/audio-scripting-fix

Audio scripting fixes
This commit is contained in:
Chris Collins 2017-06-26 10:01:52 -07:00 committed by GitHub
commit 19d3646fef
2 changed files with 7 additions and 11 deletions

View file

@ -35,8 +35,8 @@ var audioOptions = new AudioEffectOptions({
wetDryMix: 50, wetDryMix: 50,
}); });
AudioDevice.setReverbOptions(audioOptions); Audio.setReverbOptions(audioOptions);
AudioDevice.setReverb(true); Audio.setReverb(true);
print("Reverb is ON."); print("Reverb is ON.");
var panel = new Panel(10, 160); var panel = new Panel(10, 160);
@ -66,7 +66,7 @@ var parameters = [
] ]
function setter(name) { function setter(name) {
return function(value) { audioOptions[name] = value; AudioDevice.setReverbOptions(audioOptions); } return function(value) { audioOptions[name] = value; Audio.setReverbOptions(audioOptions); }
} }
function getter(name) { function getter(name) {
@ -89,7 +89,7 @@ Controller.mouseReleaseEvent.connect(function(event) { return panel.mouseRelease
function scriptEnding() { function scriptEnding() {
panel.destroy(); panel.destroy();
AudioDevice.setReverb(false); Audio.setReverb(false);
print("Reverb is OFF."); print("Reverb is OFF.");
} }
Script.scriptEnding.connect(scriptEnding); Script.scriptEnding.connect(scriptEnding);

View file

@ -20,7 +20,7 @@
var averageLoudness = 0.0; var averageLoudness = 0.0;
var AVERAGING_TIME = 0.9; var AVERAGING_TIME = 0.9;
var LOUDNESS_THRESHOLD = 100; var LOUDNESS_THRESHOLD = 100;
var HYSTERESIS_GAP = 1.41; // 3db gap var HYSTERESIS_GAP = 1.41; // 3dB gap
var MICROPHONE_DISPLAY_NAME = "Microphone"; var MICROPHONE_DISPLAY_NAME = "Microphone";
var debug = false; var debug = false;
@ -54,17 +54,13 @@ Script.update.connect(function () {
print("Muted!"); print("Muted!");
} }
isMuted = true; isMuted = true;
if (!AudioDevice.getMuted()) { Audio.muted = true;
AudioDevice.toggleMute();
}
} else if (isMuted && (averageLoudness < LOUDNESS_THRESHOLD)) { } else if (isMuted && (averageLoudness < LOUDNESS_THRESHOLD)) {
if (debug) { if (debug) {
print("UnMuted!"); print("UnMuted!");
} }
isMuted = false; isMuted = false;
if (AudioDevice.getMuted()) { Audio.muted = false;
AudioDevice.toggleMute();
}
} }
}); });