mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make usage of Audio namespace explicit in Context

This commit is contained in:
Aaron van Geffen 2024-04-20 12:24:44 +02:00 committed by GitHub
parent 82c434358a
commit 1b5d0f47ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/Context.cpp
View File

@ -84,13 +84,14 @@
#include <string> #include <string>
using namespace OpenRCT2; using namespace OpenRCT2;
using namespace OpenRCT2::Audio;
using namespace OpenRCT2::Drawing; using namespace OpenRCT2::Drawing;
using namespace OpenRCT2::Localisation; using namespace OpenRCT2::Localisation;
using namespace OpenRCT2::Paint; using namespace OpenRCT2::Paint;
using namespace OpenRCT2::Scripting; using namespace OpenRCT2::Scripting;
using namespace OpenRCT2::Ui; using namespace OpenRCT2::Ui;
using OpenRCT2::Audio::IAudioContext;
namespace OpenRCT2 namespace OpenRCT2
{ {
class Context final : public IContext class Context final : public IContext
@ -450,10 +451,10 @@ namespace OpenRCT2
if (!gOpenRCT2Headless) if (!gOpenRCT2Headless)
{ {
Init(); Audio::Init();
PopulateDevices(); Audio::PopulateDevices();
InitRideSoundsAndInfo(); Audio::InitRideSoundsAndInfo();
gGameSoundsOff = !gConfigSound.MasterSoundEnabled; Audio::gGameSoundsOff = !gConfigSound.MasterSoundEnabled;
} }
ChatInit(); ChatInit();
@ -1343,7 +1344,7 @@ namespace OpenRCT2
std::unique_ptr<IContext> CreateContext() std::unique_ptr<IContext> CreateContext()
{ {
return CreateContext(CreatePlatformEnvironment(), CreateDummyAudioContext(), CreateDummyUiContext()); return CreateContext(CreatePlatformEnvironment(), Audio::CreateDummyAudioContext(), CreateDummyUiContext());
} }
std::unique_ptr<IContext> CreateContext( std::unique_ptr<IContext> CreateContext(