Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-22 21:21:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Web] Make audio bus fetching more resilient to errors

Browse Source
This commit is contained in:
Adam Scott 2024-10-02 11:22:07 -04:00
parent 1917bc3454
commit 7a634ad2d4
No known key found for this signature in database
GPG Key ID: F6BA2A0302E21A77
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
platform/web/js/libs/library_godot_audio.js
View File

@ -868,7 +868,10 @@ class Bus {
* @returns {void} * @returns {void}
*/ */
static move(fromIndex, toIndex) { static move(fromIndex, toIndex) {
const movedBus = GodotAudio.Bus.getBus(fromIndex); const movedBus = GodotAudio.Bus.getBusOrNull(fromIndex);
if (movedBus == null) {
return;
}
const buses = GodotAudio.buses.filter((_, i) => i !== fromIndex); const buses = GodotAudio.buses.filter((_, i) => i !== fromIndex);
// Inserts at index. // Inserts at index.
buses.splice(toIndex - 1, 0, movedBus); buses.splice(toIndex - 1, 0, movedBus);
@ -1424,7 +1427,10 @@ const _GodotAudio = {
* @returns {void} * @returns {void}
*/ */
remove_sample_bus: function (index) { remove_sample_bus: function (index) {
const bus = GodotAudio.Bus.getBus(index); const bus = GodotAudio.Bus.getBusOrNull(index);
if (bus == null) {
return;
}
bus.clear(); bus.clear();
}, },
@ -1454,8 +1460,17 @@ const _GodotAudio = {
* @returns {void} * @returns {void}
*/ */
set_sample_bus_send: function (busIndex, sendIndex) { set_sample_bus_send: function (busIndex, sendIndex) {
const bus = GodotAudio.Bus.getBus(busIndex); const bus = GodotAudio.Bus.getBusOrNull(busIndex);
bus.setSend(GodotAudio.Bus.getBus(sendIndex)); if (bus == null) {
// Cannot send from an invalid bus.
return;
}
let targetBus = GodotAudio.Bus.getBusOrNull(sendIndex);
if (targetBus == null) {
// Send to master.
targetBus = GodotAudio.Bus.getBus(0);
}
bus.setSend(targetBus);
}, },
/** /**
@ -1465,7 +1480,10 @@ const _GodotAudio = {
* @returns {void} * @returns {void}
*/ */
set_sample_bus_volume_db: function (busIndex, volumeDb) { set_sample_bus_volume_db: function (busIndex, volumeDb) {
const bus = GodotAudio.Bus.getBus(busIndex); const bus = GodotAudio.Bus.getBusOrNull(busIndex);
if (bus == null) {
return;
}
bus.setVolumeDb(volumeDb); bus.setVolumeDb(volumeDb);
}, },
@ -1476,7 +1494,10 @@ const _GodotAudio = {
* @returns {void} * @returns {void}
*/ */
set_sample_bus_solo: function (busIndex, enable) { set_sample_bus_solo: function (busIndex, enable) {
const bus = GodotAudio.Bus.getBus(busIndex); const bus = GodotAudio.Bus.getBusOrNull(busIndex);
if (bus == null) {
return;
}
bus.solo(enable); bus.solo(enable);
}, },
@ -1487,7 +1508,10 @@ const _GodotAudio = {
* @returns {void} * @returns {void}
*/ */
set_sample_bus_mute: function (busIndex, enable) { set_sample_bus_mute: function (busIndex, enable) {
const bus = GodotAudio.Bus.getBus(busIndex); const bus = GodotAudio.Bus.getBusOrNull(busIndex);
if (bus == null) {
return;
}
bus.mute(enable); bus.mute(enable);
}, },
}, },