GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix crash when using multiple audio clips streaming with XAudio2 backend

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-22 13:01:05 +02:00
parent 8d0cfcf05d
commit 2090cba743
8 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Engine/Audio/AudioClip.cpp
View File

@@ -19,7 +19,7 @@ REGISTER_BINARY_ASSET_WITH_UPGRADER(AudioClip, "FlaxEngine.AudioClip", AudioClip
bool AudioClip::StreamingTask::Run()
{
AssetReference<AudioClip> ref = _asset.Get();
if (ref == nullptr)
if (ref == nullptr || AudioBackend::Instance == nullptr)
return true;
ScopeLock lock(ref->Locker);
const auto& queue = ref->StreamingQueue;
@@ -34,13 +34,13 @@ bool AudioClip::StreamingTask::Run()
uint32& bufferId = clip->Buffers[idx];
if (bufferId == AUDIO_BUFFER_ID_INVALID)
{
AudioBackend::Buffer::Create(bufferId);
bufferId = AudioBackend::Buffer::Create();
}
else
{
// Release unused data
AudioBackend::Buffer::Delete(bufferId);
bufferId = 0;
bufferId = AUDIO_BUFFER_ID_INVALID;
}
}
@@ -370,9 +370,7 @@ Asset::LoadResult AudioClip::load()
return LoadResult::CannotLoadData;
// Create single buffer
uint32 bufferId;
AudioBackend::Buffer::Create(bufferId);
Buffers[0] = bufferId;
Buffers[0] = AudioBackend::Buffer::Create();
// Write data to audio buffer
if (WriteBuffer(0))
@@ -398,14 +396,12 @@ void AudioClip::unload(bool isReloading)
StopStreaming();
StreamingQueue.Clear();
if (hasAnyBuffer)
if (hasAnyBuffer && AudioBackend::Instance)
{
for (AUDIO_BUFFER_ID_TYPE bufferId : Buffers)
{
if (bufferId != AUDIO_BUFFER_ID_INVALID)
{
AudioBackend::Buffer::Delete(bufferId);
}
}
}
Buffers.Clear();