piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 09:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wii-usb

Browse Source
This commit is contained in:
Matthew Parlane
2012-11-15 01:19:02 +13:00
parent d8b879a4ee e4d18e3a8b
commit b01489b2da
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
View File

@ -172,8 +172,6 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
if (!ReadPB(blockAddr, PB))
break;
ProcessUpdates(PB);
if (m_CRC != 0x3389a79e)
VoiceHacks(PB);
@ -335,6 +333,24 @@ bool CUCode_AX::AXTask(u32& _uMail)
PBaddr[numPBaddr] = HLEMemory_Read_U32(uAddress);
numPBaddr++;
// HACK: process updates right now instead of waiting until
// Premix is called. Some games using sequenced music (Tales of
// Symphonia for example) thought PBs were unused because we
// were too slow to update them and set them as running. This
// happens because Premix is basically completely desync-ed
// from the emulation core (it's running in the audio thread).
// Fixing this would require rewriting most of the AX HLE.
u32 block_addr = uAddress;
AXPB pb;
for (int i = 0; block_addr && i < NUMBER_OF_PBS; i++)
{
if (!ReadPB(block_addr, pb))
break;
ProcessUpdates(pb);
WritePB(block_addr, pb);
block_addr = (pb.next_pb_hi << 16) | pb.next_pb_lo;
}
m_addressPBs = HLEMemory_Read_U32(uAddress); // left in for now
uAddress += 4;
soundStream->GetMixer()->SetHLEReady(true);

2
Source/Core/Core/Src/Movie.cpp
View File

@ -131,7 +131,7 @@ void Init()
g_bFrameStep = false;
g_bFrameStop = false;
bSaveConfig = false;
iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
if (IsPlayingInput())
{
ReadHeader();