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

Updated how Fixed audio works with dual buffers and AI Interrupts

This commit is contained in:
zilmar 2012-11-03 10:27:19 +11:00
parent 8af55ad6c0
commit ffb69091a1
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ DWORD CAudio::GetLength ( void )
DWORD TimeLeft = _SystemTimer->GetTimer(CSystemTimer::AiTimer); DWORD TimeLeft = _SystemTimer->GetTimer(CSystemTimer::AiTimer);
if (TimeLeft > 0) if (TimeLeft > 0)
{ {
return TimeLeft / m_CountsPerByte; return (TimeLeft / m_CountsPerByte) + m_SecondBuff;
} }
return 0; return 0;
} }
@ -38,15 +38,14 @@ 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)
{ {
DWORD NewLength = GetLength() + _Reg->AI_LEN_REG; if (GetLength() == 0)
_SystemTimer->SetTimer(CSystemTimer::AiTimer,NewLength * m_CountsPerByte,false); {
WriteTraceF(TraceAudio,__FUNCTION__ ": NewLength = %d",NewLength); WriteTraceF(TraceAudio,__FUNCTION__ ": Set Timer AI_LEN_REG: %d m_CountsPerByte: %d",_Reg->AI_LEN_REG,m_CountsPerByte);
/*if (m_CurrentLength == 0) { _SystemTimer->SetTimer(CSystemTimer::AiTimer,_Reg->AI_LEN_REG * m_CountsPerByte,false);
m_CurrentLength = _Reg->AI_LEN_REG;
} else { } else {
m_SecondBuff = _Reg->AI_LEN_REG; m_SecondBuff = _Reg->AI_LEN_REG;
//m_Status |= 0x80000000; m_Status |= 0x80000000;
}*/ }
} else { } else {
_SystemTimer->StopTimer(CSystemTimer::AiTimer); _SystemTimer->StopTimer(CSystemTimer::AiTimer);
m_SecondBuff = 0; m_SecondBuff = 0;
@ -61,17 +60,16 @@ void CAudio::LenChanged ( void )
void CAudio::TimerDone ( void ) void CAudio::TimerDone ( void )
{ {
/*_Reg->MI_INTR_REG |= MI_INTR_AI;
_Reg->CheckInterrupts();
if (m_SecondBuff != 0) { if (m_SecondBuff == 0)
_SystemTimer->SetTimer(CSystemTimer::AiTimer,m_SecondBuff * m_CountsPerByte,false); {
return;
} }
m_CurrentLength = m_SecondBuff; _SystemTimer->SetTimer(CSystemTimer::AiTimer,m_SecondBuff * m_CountsPerByte,false);
_Reg->MI_INTR_REG |= MI_INTR_AI;
_Reg->CheckInterrupts();
m_SecondBuff = 0; m_SecondBuff = 0;
m_Status &= 0x7FFFFFFF; m_Status &= 0x7FFFFFFF;
*/
m_SecondBuff = 0;
} }
void CAudio::SetViIntr ( DWORD /*VI_INTR_TIME*/ ) void CAudio::SetViIntr ( DWORD /*VI_INTR_TIME*/ )