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

Merge pull request #1379 from Frank-74/Add-AI_LEN-for-FAT-off 

[Project64-Audio] Add AI_LEN for FAT off
This commit is contained in:
zilmar 2017-09-25 22:00:37 +10:00 committed by GitHub
parent be07328e9d dddfdd8cbf
commit 2dd8a7b82f
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Project64-audio/AudioMain.cpp
View File

@ -106,8 +106,13 @@ EXPORT void CALL AiLenChanged(void)
EXPORT uint32_t CALL AiReadLength(void)
{
WriteTrace(TraceAudioInterface, TraceDebug, "Called");
return 0;
WriteTrace(TraceAudioInterface, TraceDebug, "Start");
if (g_SoundDriver == NULL)
{
return 0;
}
WriteTrace(TraceAudioInterface, TraceDebug, "Done (res: %d)", g_SoundDriver->AI_ReadLength());
return g_SoundDriver->AI_ReadLength();
}
EXPORT void CALL AiUpdate(int32_t Wait)
@ -208,4 +213,4 @@ extern "C" void UseUnregisteredSetting(int /*SettingID*/)
#ifdef _WIN32
DebugBreak();
#endif
}
}

7
Source/Project64-audio/Driver/SoundBase.cpp
View File

@ -182,6 +182,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*/)
{
}
@ -192,4 +197,4 @@ void SoundDriverBase::StartAudio()
void SoundDriverBase::StopAudio()
{
}
}

3
Source/Project64-audio/Driver/SoundBase.h
View File

@ -28,6 +28,7 @@ public:
void AI_Startup();
void AI_Shutdown();
void AI_Update(bool Wait);
uint32_t AI_ReadLength();
virtual void SetFrequency(uint32_t Frequency);
virtual void StartAudio();
@ -52,4 +53,4 @@ private:
uint32_t m_CurrentWriteLoc; // Currently writing Buffer
uint8_t m_Buffer[MAX_SIZE]; // Emulated buffers
bool m_SyncAudio;
};
};