ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Oops.

This commit is contained in:
gibbed 2014-01-13 02:49:30 -08:00
parent c1b71ce1db
commit e1bb5bc860
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/apu/xaudio2/xaudio2_audio_system.cc
View File

@ -88,11 +88,7 @@ void XAudio2AudioSystem::Initialize() {
config.LogFileline = TRUE; config.LogFileline = TRUE;
audio_->SetDebugConfiguration(&config); audio_->SetDebugConfiguration(&config);
<<<<<<< HEAD
hr = audio_->CreateMasteringVoice(&mastering_voice_, active_channels_, 48000); hr = audio_->CreateMasteringVoice(&mastering_voice_, active_channels_, 48000);
=======
hr = audio_->CreateMasteringVoice(&mastering_voice_, 6, 48000);
>>>>>>> 6f09c12bc280b70e852867ba182dde6fef652f54
if (FAILED(hr)) { if (FAILED(hr)) {
XELOGE("CreateMasteringVoice failed with %.8X", hr); XELOGE("CreateMasteringVoice failed with %.8X", hr);
XEASSERTALWAYS(); XEASSERTALWAYS();