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

Merge pull request #1559 from Frank-74/patch-1 

[Project64-Audio] Fix Sync using audio OFF
This commit is contained in:
zilmar 2019-01-17 13:53:26 +10:30 committed by GitHub
parent 52c62e5707 57884f1091
commit bbb97551de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-audio/AudioSettings.cpp
View File

@ -163,7 +163,7 @@ void CSettings::ReadSettings(void)
m_FPSBuffer = GetSetting(Set_FPSBuffer) != 0;
m_FullSpeed = m_Set_FullSpeed ? GetSystemSetting(m_Set_FullSpeed) != 0 : false;
m_SyncAudio = ((!m_advanced_options || bLimitFPS) && SyncAudio && m_FullSpeed);
m_SyncAudio = ((!m_advanced_options || bLimitFPS);
if (m_Set_log_dir != 0)
{

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

@ -51,7 +51,7 @@ void SoundDriverBase::AI_LenChanged(uint8_t *start, uint32_t length)
WriteTrace(TraceAudioDriver, TraceDebug, "Start");
// Bleed off some of this buffer to smooth out audio
if (length < m_MaxBufferSize && g_settings->SyncAudio())
if (g_settings->SyncAudio() || !g_settings->FullSpeed())
{
while ((m_BufferRemaining) == m_MaxBufferSize)
{