mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Remove the use of shared_ptr for the Context (#24404)

Browse Source 
* Replace shared_ptr with unique_ptr for Context systems, return refs

* Fix all the users

* clang-format fix

* Fix linux builds
This commit is contained in:
Matt
2025-05-15 22:46:06 +03:00
committed by GitHub
parent c2e042e5e1
commit 42df41efdb
68 changed files with 286 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/object/MusicObject.cpp
View File

@@ -47,13 +47,13 @@ void MusicObject::Load()
}
// Load metadata of samples
auto audioContext = GetContext()->GetAudioContext();
auto& audioContext = GetContext()->GetAudioContext();
for (auto& track : _tracks)
{
auto stream = track.Asset.GetStream();
if (stream != nullptr)
{
auto source = audioContext->CreateStreamFromWAV(std::move(stream));
auto source = audioContext.CreateStreamFromWAV(std::move(stream));
if (source != nullptr)
{
track.BytesPerTick = source->GetBytesPerSecond() / 40;
@@ -226,8 +226,8 @@ ObjectAsset MusicObject::GetAsset(IReadObjectContext& context, std::string_view
{
if (path.find("$RCT2:DATA/") == 0)
{
auto env = GetContext()->GetPlatformEnvironment();
auto path2 = env->FindFile(DirBase::rct2, DirId::data, path.substr(11));
auto& env = GetContext()->GetPlatformEnvironment();
auto path2 = env.FindFile(DirBase::rct2, DirId::data, path.substr(11));
return ObjectAsset(path2);
}