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

Merge branch 'master' of https://github.com/benvanik/xenia 

Conflicts:
	src/xenia/apu/xaudio2/xaudio2_audio_system.cc
This commit is contained in:
gibbed 2014-01-13 02:46:50 -08:00
parent f47ebb5010 6f09c12bc2
commit c1b71ce1db
1 changed files with 4 additions and 0 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,7 +88,11 @@ 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();