Merge pull request #3955 from aliaspider/master

(WiiU) fix audio.
This commit is contained in:
Twinaphex 2016-11-06 22:22:52 +01:00 committed by GitHub
commit 53da2f8142
2 changed files with 11 additions and 14 deletions

View File

@ -120,15 +120,15 @@ static void* ax_audio_init(const char* device, unsigned rate, unsigned latency)
AXVoiceVeData ve = {0x4000, 0};
AXSetVoiceVe(ax->voice_l, &ve);
AXSetVoiceVe(ax->voice_r, &ve);
AXVoiceDeviceMixData mix = {0};
mix.bus[0].volume = 0x4000;
mix.bus[1].volume = 0x0000;
AXSetVoiceDeviceMix(ax->voice_l, AX_DEVICE_TYPE_DRC, 0, &mix);
AXSetVoiceDeviceMix(ax->voice_l, AX_DEVICE_TYPE_TV, 0, &mix);
mix.bus[0].volume = 0x0000;
mix.bus[1].volume = 0x4000;
AXSetVoiceDeviceMix(ax->voice_r, AX_DEVICE_TYPE_DRC, 0, &mix);
AXSetVoiceDeviceMix(ax->voice_r, AX_DEVICE_TYPE_TV, 0, &mix);
u32 mix[24]= {0};
mix[0] = 0x80000000;
AXSetVoiceDeviceMix(ax->voice_l, AX_DEVICE_TYPE_DRC, 0, (AXVoiceDeviceMixData*)mix);
AXSetVoiceDeviceMix(ax->voice_l, AX_DEVICE_TYPE_TV, 0, (AXVoiceDeviceMixData*)mix);
mix[0] = 0;
mix[4] = 0x80000000;
AXSetVoiceDeviceMix(ax->voice_r, AX_DEVICE_TYPE_DRC, 0, (AXVoiceDeviceMixData*)mix);
AXSetVoiceDeviceMix(ax->voice_r, AX_DEVICE_TYPE_TV, 0, (AXVoiceDeviceMixData*)mix);
AXSetVoiceState(ax->voice_l, AX_VOICE_STATE_PLAYING);
AXSetVoiceState(ax->voice_r, AX_VOICE_STATE_PLAYING);

View File

@ -273,7 +273,7 @@ static void* wiiu_gfx_init(const video_info_t* video,
wiiu->texture.surface.image = MEM2_alloc(wiiu->texture.surface.imageSize,
wiiu->texture.surface.alignment);
// memset(wiiu->texture.surface.image, 0x88, wiiu->texture.surface.imageSize);
memset(wiiu->texture.surface.image, 0x0, wiiu->texture.surface.imageSize);
GX2Invalidate(GX2_INVALIDATE_MODE_CPU_TEXTURE, wiiu->texture.surface.image,
wiiu->texture.surface.imageSize);
@ -293,10 +293,7 @@ static void* wiiu_gfx_init(const video_info_t* video,
wiiu->menu.texture.surface.image = MEM2_alloc(wiiu->menu.texture.surface.imageSize,
wiiu->menu.texture.surface.alignment);
for (i = 0; i < wiiu->menu.texture.surface.imageSize / 4; i++)
((uint32_t*)wiiu->menu.texture.surface.image)[i] = 0xFFFFFFFF;
((uint32_t*)wiiu->menu.texture.surface.image)[0] = 0xFF0000FF;
memset(wiiu->menu.texture.surface.image, 0x0, wiiu->menu.texture.surface.imageSize);
GX2Invalidate(GX2_INVALIDATE_MODE_CPU_TEXTURE, wiiu->menu.texture.surface.image,
wiiu->menu.texture.surface.imageSize);