nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio crash fix when device is not available

Browse Source
This commit is contained in:
Turánszki János
2025-06-19 17:46:01 +02:00
parent 33f0ed9598
commit e4903cdf2b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/wiAudio.cpp
+12 -10
View File
@@ -536,14 +536,14 @@ namespace wi::audio
{
if (instance == nullptr || !instance->IsValid())
{
xaudio_check(audio_internal->masteringVoice->SetVolume(volume));
if (audio_internal->masteringVoice != nullptr)
xaudio_check(audio_internal->masteringVoice->SetVolume(volume));
}
else
{
auto instanceinternal = to_internal(instance);
xaudio_check(instanceinternal->sourceVoice->SetVolume(volume));
if (instanceinternal->sourceVoice != nullptr)
xaudio_check(instanceinternal->sourceVoice->SetVolume(volume));
}
}
float GetVolume(const SoundInstance* instance)
@@ -551,12 +551,14 @@ namespace wi::audio
float volume = 0;
if (instance == nullptr || !instance->IsValid())
{
audio_internal->masteringVoice->GetVolume(&volume);
if(audio_internal->masteringVoice != nullptr)
audio_internal->masteringVoice->GetVolume(&volume);
}
else
{
auto instanceinternal = to_internal(instance);
instanceinternal->sourceVoice->GetVolume(&volume);
if(instanceinternal->sourceVoice != nullptr)
instanceinternal->sourceVoice->GetVolume(&volume);
}
return volume;
}
@@ -573,7 +575,6 @@ namespace wi::audio
{
instanceinternal->buffer.LoopCount = 0;
xaudio_check(instanceinternal->sourceVoice->SubmitSourceBuffer(&instanceinternal->buffer));
}
}
}
@@ -606,7 +607,8 @@ namespace wi::audio
{
auto instanceinternal = to_internal(instance);
XAUDIO2_VOICE_STATE state = {};
instanceinternal->sourceVoice->GetState(&state, 0);
if (instanceinternal->sourceVoice != nullptr)
instanceinternal->sourceVoice->GetState(&state, 0);
return state.SamplesPlayed;
}
return 0ull;
@@ -614,8 +616,8 @@ namespace wi::audio
void SetSubmixVolume(SUBMIX_TYPE type, float volume)
{
xaudio_check(audio_internal->submixVoices[type]->SetVolume(volume));
if(audio_internal->submixVoices[type] != nullptr)
xaudio_check(audio_internal->submixVoices[type]->SetVolume(volume));
}
float GetSubmixVolume(SUBMIX_TYPE type)
{