From 1b5d0f47ab30140ced7f643f3ee02077ade7e486 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sat, 20 Apr 2024 12:24:44 +0200 Subject: [PATCH] Make usage of Audio namespace explicit in Context --- src/openrct2/Context.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index cc45c35a30..4a20040c91 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -84,13 +84,14 @@ #include using namespace OpenRCT2; -using namespace OpenRCT2::Audio; using namespace OpenRCT2::Drawing; using namespace OpenRCT2::Localisation; using namespace OpenRCT2::Paint; using namespace OpenRCT2::Scripting; using namespace OpenRCT2::Ui; +using OpenRCT2::Audio::IAudioContext; + namespace OpenRCT2 { class Context final : public IContext @@ -450,10 +451,10 @@ namespace OpenRCT2 if (!gOpenRCT2Headless) { - Init(); - PopulateDevices(); - InitRideSoundsAndInfo(); - gGameSoundsOff = !gConfigSound.MasterSoundEnabled; + Audio::Init(); + Audio::PopulateDevices(); + Audio::InitRideSoundsAndInfo(); + Audio::gGameSoundsOff = !gConfigSound.MasterSoundEnabled; } ChatInit(); @@ -1343,7 +1344,7 @@ namespace OpenRCT2 std::unique_ptr CreateContext() { - return CreateContext(CreatePlatformEnvironment(), CreateDummyAudioContext(), CreateDummyUiContext()); + return CreateContext(CreatePlatformEnvironment(), Audio::CreateDummyAudioContext(), CreateDummyUiContext()); } std::unique_ptr CreateContext(