From 133cbedad85202dd45c3dca75e89e1c8661b65f4 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Mon, 13 Jan 2014 00:33:25 -0800 Subject: [PATCH] Replacing exit with assert, as exits are hard to find. --- src/xenia/apu/xaudio2/xaudio2_audio_system.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_system.cc b/src/xenia/apu/xaudio2/xaudio2_audio_system.cc index be1381d4f..c3a29d61a 100644 --- a/src/xenia/apu/xaudio2/xaudio2_audio_system.cc +++ b/src/xenia/apu/xaudio2/xaudio2_audio_system.cc @@ -60,7 +60,7 @@ void XAudio2AudioSystem::Initialize() { hr = XAudio2Create(&audio_, 0, XAUDIO2_DEFAULT_PROCESSOR); if (FAILED(hr)) { XELOGE("XAudio2Create failed with %.8X", hr); - exit(1); + XEASSERTALWAYS(); return; } @@ -76,7 +76,8 @@ void XAudio2AudioSystem::Initialize() { hr = audio_->CreateMasteringVoice(&mastering_voice_); if (FAILED(hr)) { XELOGE("CreateMasteringVoice failed with %.8X", hr); - exit(1); + XEASSERTALWAYS(); + return; } WAVEFORMATIEEEFLOATEX waveformat; @@ -94,11 +95,12 @@ void XAudio2AudioSystem::Initialize() { SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; hr = audio_->CreateSourceVoice( - &pcm_voice_, &waveformat, 0, XAUDIO2_DEFAULT_FREQ_RATIO, + &pcm_voice_, (WAVEFORMATEX*)&waveformat, 0, XAUDIO2_DEFAULT_FREQ_RATIO, voice_callback_); if (FAILED(hr)) { XELOGE("CreateSourceVoice failed with %.8X", hr); - exit(1); + XEASSERTALWAYS(); + return; } // @@ -143,12 +145,14 @@ void XAudio2AudioSystem::SubmitFrame(uint32_t samples_ptr) { hr = pcm_voice_->SubmitSourceBuffer(&buffer); if (FAILED(hr)) { XELOGE("SubmitSourceBuffer failed with %.8X", hr); - exit(1); + XEASSERTALWAYS(); + return; } hr = pcm_voice_->Start(0); if (FAILED(hr)) { XELOGE("Start failed with %.8X", hr); - exit(1); + XEASSERTALWAYS(); + return; } }