diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-08 16:59:11 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-08 16:59:11 +0200 |
commit | 70e77a8383b0615570a8ef45d0f0c263c21982c5 (patch) | |
tree | 9946fd42abcd2c75eaf607d8d9815b3b06e80468 /servers/audio_server.cpp | |
parent | 00de140d467740de917735c62e53e9fb5ba68bde (diff) | |
parent | 49b6067aba3d3720293626ecbe9a277e59cac3a6 (diff) | |
download | redot-engine-70e77a8383b0615570a8ef45d0f0c263c21982c5.tar.gz |
Merge pull request #80381 from Calinou/audio-bus-master-use-scenestringnames
Use StringName consistently to refer to the Master audio bus name
Diffstat (limited to 'servers/audio_server.cpp')
-rw-r--r-- | servers/audio_server.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 49991e41d3..2308fcca9e 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -40,6 +40,7 @@ #include "core/string/string_name.h" #include "core/templates/pair.h" #include "scene/resources/audio_stream_wav.h" +#include "scene/scene_string_names.h" #include "servers/audio/audio_driver_dummy.h" #include "servers/audio/effects/audio_effect_compressor.h" @@ -747,7 +748,7 @@ void AudioServer::set_bus_count(int p_count) { buses[i]->bypass = false; buses[i]->volume_db = 0; if (i > 0) { - buses[i]->send = "Master"; + buses[i]->send = SceneStringNames::get_singleton()->Master; } bus_map[attempt] = buses[i]; @@ -1582,7 +1583,7 @@ void AudioServer::set_bus_layout(const Ref<AudioBusLayout> &p_bus_layout) { for (int i = 0; i < p_bus_layout->buses.size(); i++) { Bus *bus = memnew(Bus); if (i == 0) { - bus->name = "Master"; + bus->name = SceneStringNames::get_singleton()->Master; } else { bus->name = p_bus_layout->buses[i].name; bus->send = p_bus_layout->buses[i].send; @@ -1891,5 +1892,5 @@ void AudioBusLayout::_get_property_list(List<PropertyInfo> *p_list) const { AudioBusLayout::AudioBusLayout() { buses.resize(1); - buses.write[0].name = "Master"; + buses.write[0].name = SceneStringNames::get_singleton()->Master; } |