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

Audio: Rewrote sync to audio

This commit is contained in:
zilmar 2012-12-31 22:02:51 +11:00
parent 42dbc691bd
commit 6ac9d18e7f
3 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp
View File

@ -207,12 +207,6 @@ void CInterpreterCPU::InPermLoop (void) {
g_Notify->DisplayError(GS(MSG_PERM_LOOP)); g_Notify->DisplayError(GS(MSG_PERM_LOOP));
g_System->CloseCpu(); g_System->CloseCpu();
} else { } else {
/* check sound playing */
g_System->SyncToAudio();
/* check RSP running */
/* check RDP running */
if (*g_NextTimer > 0) { if (*g_NextTimer > 0) {
*g_NextTimer = 0 - g_System->CountPerOp(); *g_NextTimer = 0 - g_System->CountPerOp();
g_SystemTimer->UpdateTimers(); g_SystemTimer->UpdateTimers();

4
Source/Project64/N64 System/Mips/Audio.cpp
View File

@ -91,6 +91,10 @@ void CAudio::TimerDone ( void )
g_SystemTimer->SetTimer(CSystemTimer::AiTimer,m_SecondBuff * m_CountsPerByte,false); g_SystemTimer->SetTimer(CSystemTimer::AiTimer,m_SecondBuff * m_CountsPerByte,false);
m_SecondBuff = 0; m_SecondBuff = 0;
} else { } else {
if (g_Reg->m_AudioIntrReg == 0)
{
g_System->SyncToAudio();
}
g_Reg->MI_INTR_REG |= MI_INTR_AI; g_Reg->MI_INTR_REG |= MI_INTR_AI;
g_Reg->CheckInterrupts(); g_Reg->CheckInterrupts();
m_Status &= 0x7FFFFFFF; m_Status &= 0x7FFFFFFF;

47
Source/Project64/N64 System/N64 Class.cpp
View File

@ -1628,52 +1628,29 @@ void CN64System::RunRSP ( void ) {
} }
} }
void CN64System::SyncToAudio ( void ) { void CN64System::SyncToAudio ( void )
if (!bBasicMode() && !bLimitFPS() ) {
if (!bSyncToAudio() || !bLimitFPS())
{ {
return; return;
} }
if (!bFixedAudio())
{
return;
}
if (!bSyncToAudio())
{
return;
}
// if (m_Reg.GetCurrentTimerType() != AiTimer)
// {
// return;
// }
if (g_Audio->GetLength() == 0)
{
return;
}
DWORD (__cdecl* AiReadLength) ( void );
AiReadLength = g_Plugins->Audio()->ReadLength;
if (AiReadLength() == 0)
{
return;
}
SPECIAL_TIMERS CPU_UsageAddr = Timer_None; SPECIAL_TIMERS CPU_UsageAddr = Timer_None;
if (bShowCPUPer())
if (bShowCPUPer()) { CPU_UsageAddr = m_CPU_Usage.StartTimer(Timer_Idel); }
for (int i = 0; i < 50; i++)
{ {
CPU_UsageAddr = m_CPU_Usage.StartTimer(Timer_Idel); if (g_Reg->m_AudioIntrReg != 0)
} {
while (!m_EndEmulation) WriteTraceF(TraceAudio, __FUNCTION__ ": Audio Interrupt done (%d)",i);
{ break;
Sleep(10);
if (AiReadLength() == 0)
{
break;
} }
Sleep(1);
} }
if (bShowCPUPer()) if (bShowCPUPer())
{ {
m_CPU_Usage.StartTimer(CPU_UsageAddr != Timer_None ? CPU_UsageAddr : Timer_R4300 ); m_CPU_Usage.StartTimer(CPU_UsageAddr != Timer_None ? CPU_UsageAddr : Timer_R4300 );
} }
} }
void CN64System::RefreshScreen ( void ) { void CN64System::RefreshScreen ( void ) {