GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-05-28 00:01:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disable audio until bugs and hosting can be worked out

Browse Source
This commit is contained in:
Michael Townsend
2020-10-05 12:23:08 -04:00
parent a601473645
commit 9e19425a9e
2 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/audio.js
+22
View File
@@ -9,8 +9,18 @@ var AudioEngine = {
_currentBackgroundMusic: null,
_currentEventAudio: null,
_currentSoundEffectAudio: null,
_initialized: false,
init: function () {
AudioEngine._initAudioContext();
// start loading music and events early
for (var key in AudioLibrary) {
if (
key.toString().indexOf('MUSIC_') > -1 ||
key.toString().indexOf('EVENT_') > -1) {
AudioEngine.loadAudioFile(AudioLibrary[key]);
}
}
AudioEngine._initialized = true;
},
_initAudioContext: function () {
AudioEngine._audioContext = new (window.AudioContext || window.webkitAudioContext);
@@ -152,21 +162,33 @@ var AudioEngine = {
}
},
playBackgroundMusic: function (src) {
if (!AudioEngine._initialized) {
return;
}
AudioEngine.loadAudioFile(src)
.then(function (buffer) {
AudioEngine._playBackgroundMusic(buffer);
});
},
playEventMusic: function (src) {
if (!AudioEngine._initialized) {
return;
}
AudioEngine.loadAudioFile(src)
.then(function (buffer) {
AudioEngine._playEventMusic(buffer);
});
},
stopEventMusic: function () {
if (!AudioEngine._initialized) {
return;
}
AudioEngine._stopEventMusic();
},
playSound: function (src) {
if (!AudioEngine._initialized) {
return;
}
AudioEngine.loadAudioFile(src)
.then(function (buffer) {
AudioEngine._playSound(buffer);
script/engine.js
+14 -20
View File
@@ -104,15 +104,6 @@
Engine.loadGame();
}
// start loading music and events early
for (var key in AudioLibrary) {
if (
key.toString().indexOf('MUSIC_') > -1 ||
key.toString().indexOf('EVENT_') > -1) {
AudioEngine.loadAudioFile(AudioLibrary[key]);
}
}
$('<div>').attr('id', 'locationSlider').appendTo('#main');
var menu = $('<div>')
@@ -142,11 +133,12 @@
});
}
$('<span>')
.addClass('volume menuBtn')
.text(_('sound on.'))
.click(() => Engine.toggleVolume())
.appendTo(menu);
// Disable this for now
// $('<span>')
// .addClass('volume menuBtn')
// .text(_('sound on.'))
// .click(() => Engine.toggleVolume())
// .appendTo(menu);
$('<span>')
.addClass('appStore menuBtn')
@@ -215,7 +207,7 @@
$.Dispatch('stateUpdate').subscribe(Engine.handleStateUpdates);
$SM.init();
AudioEngine.init();
// AudioEngine.init(); Disable this for now
Notifications.init();
Events.init();
Room.init();
@@ -239,15 +231,17 @@
Engine.triggerHyperMode();
}
Engine.toggleVolume(Boolean($SM.get('config.soundOn')));
if(!AudioEngine.isAudioContextRunning()){
document.addEventListener('click', Engine.resumeAudioContext, true);
}
// Disable this for now
// Engine.toggleVolume(Boolean($SM.get('config.soundOn')));
// if(!AudioEngine.isAudioContextRunning()){
// document.addEventListener('click', Engine.resumeAudioContext, true);
// }
Engine.saveLanguage();
Engine.travelTo(Room);
setTimeout(notifyAboutSound, 3000);
// Disable this for now
// setTimeout(notifyAboutSound, 3000);
},
resumeAudioContext: function () {