Merge branch 'master' of https://github.com/project64/project64
Conflicts: Source/Project64-audio/AudioMain.cpp
This commit is contained in:
commit
892aed6dad
|
@ -188,6 +188,11 @@ void SoundDriverBase::BufferAudio()
|
|||
WriteTrace(TraceAudioDriver, TraceVerbose, "Done (m_BufferRemaining: 0x%08X)", m_BufferRemaining);
|
||||
}
|
||||
|
||||
uint32_t SoundDriverBase::AI_ReadLength()
|
||||
{
|
||||
return (m_AI_DMAPrimaryBytes & ~ 3);
|
||||
}
|
||||
|
||||
void SoundDriverBase::SetFrequency(uint32_t /*Frequency*/)
|
||||
{
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue