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

Tweak Fixed Audio

This commit is contained in:
zilmar 2012-11-06 21:23:47 +11:00
parent 38101b40e3
commit 0f9ff4256b
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,17 +38,17 @@ void CAudio::LenChanged ( void )
WriteTraceF(TraceAudio,__FUNCTION__ ": _Reg->AI_LEN_REG = %d",_Reg->AI_LEN_REG); WriteTraceF(TraceAudio,__FUNCTION__ ": _Reg->AI_LEN_REG = %d",_Reg->AI_LEN_REG);
if (_Reg->AI_LEN_REG != 0) if (_Reg->AI_LEN_REG != 0)
{ {
if (_Reg->AI_LEN_REG > 0x8000) if (_Reg->AI_LEN_REG >= 0x20000)
{ {
WriteTraceF(TraceAudio,__FUNCTION__ ": Ignoring Write, To Large (%X)",_Reg->AI_LEN_REG); WriteTraceF(TraceAudio,__FUNCTION__ ": Ignoring Write, To Large (%X)",_Reg->AI_LEN_REG);
} else { } else {
m_Status |= 0x80000000;
if (GetLength() == 0) if (GetLength() == 0)
{ {
WriteTraceF(TraceAudio,__FUNCTION__ ": Set Timer AI_LEN_REG: %d m_CountsPerByte: %d",_Reg->AI_LEN_REG,m_CountsPerByte); WriteTraceF(TraceAudio,__FUNCTION__ ": Set Timer AI_LEN_REG: %d m_CountsPerByte: %d",_Reg->AI_LEN_REG,m_CountsPerByte);
_SystemTimer->SetTimer(CSystemTimer::AiTimer,_Reg->AI_LEN_REG * m_CountsPerByte,false); _SystemTimer->SetTimer(CSystemTimer::AiTimer,_Reg->AI_LEN_REG * m_CountsPerByte,false);
} else { } else {
m_SecondBuff = _Reg->AI_LEN_REG; m_SecondBuff += _Reg->AI_LEN_REG;
m_Status |= 0x80000000;
} }
} }
} else { } else {
@ -65,17 +65,16 @@ void CAudio::LenChanged ( void )
void CAudio::TimerDone ( void ) void CAudio::TimerDone ( void )
{ {
if (m_SecondBuff != 0)
if (m_SecondBuff == 0)
{ {
return;
}
_SystemTimer->SetTimer(CSystemTimer::AiTimer,m_SecondBuff * m_CountsPerByte,false); _SystemTimer->SetTimer(CSystemTimer::AiTimer,m_SecondBuff * m_CountsPerByte,false);
m_SecondBuff = 0;
} else {
_Reg->MI_INTR_REG |= MI_INTR_AI; _Reg->MI_INTR_REG |= MI_INTR_AI;
_Reg->CheckInterrupts(); _Reg->CheckInterrupts();
m_SecondBuff = 0;
m_Status &= 0x7FFFFFFF; m_Status &= 0x7FFFFFFF;
} }
}
void CAudio::SetViIntr ( DWORD /*VI_INTR_TIME*/ ) void CAudio::SetViIntr ( DWORD /*VI_INTR_TIME*/ )
{ {