mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 22:13:07 +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

7
src/openrct2/object/AudioSampleTable.cpp
View File

@@ -110,7 +110,6 @@ void AudioSampleTable::LoadFrom(const AudioSampleTable& table, size_t sourceStar
void AudioSampleTable::Load()
{
auto audioContext = GetContext()->GetAudioContext();
for (size_t i = 0; i < _entries.size(); i++)
{
auto& entry = _entries[i];
@@ -158,14 +157,14 @@ IAudioSource* AudioSampleTable::LoadSample(uint32_t index) const
auto stream = entry.Asset->GetStream();
if (stream != nullptr)
{
auto audioContext = GetContext()->GetAudioContext();
auto& audioContext = GetContext()->GetAudioContext();
if (entry.PathIndex)
{
result = audioContext->CreateStreamFromCSS(std::move(stream), *entry.PathIndex);
result = audioContext.CreateStreamFromCSS(std::move(stream), *entry.PathIndex);
}
else
{
result = audioContext->CreateStreamFromWAV(std::move(stream));
result = audioContext.CreateStreamFromWAV(std::move(stream));
}
}
}