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

Merge pull request #1560 from Frank-74/patch-2 

Patch 2 Fix typo in last PR
This commit is contained in:
zilmar 2019-01-17 15:33:41 +10:30 committed by GitHub
parent bbb97551de 52aaf57097
commit 618be8fdeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,8 +82,8 @@ CSettings::~CSettings()
void CSettings::RegisterSettings(void)
{
SetModuleName("default");
m_Set_SyncViaAudioEnabled = FindSystemSettingId("SyncViaAudioEnabled");
m_Set_EnableAudio = FindSystemSettingId("Enable Audio");
m_Set_SyncViaAudioEnabled = FindSystemSettingId("SyncViaAudioEnabled");
m_Set_EnableAudio = FindSystemSettingId("Enable Audio");
m_Set_FixedAudio = FindSystemSettingId("Fixed Audio");
m_Set_SyncAudio = FindSystemSettingId("Sync Audio");
m_Set_FullSpeed = FindSystemSettingId("Full Speed");
@ -108,10 +108,10 @@ void CSettings::RegisterSettings(void)
void CSettings::SetSyncViaAudioEnabled(bool Enabled)
{
if (m_Set_SyncViaAudioEnabled != 0)
{
SetSystemSetting(m_Set_SyncViaAudioEnabled, Enabled ? 1 : 0);
}
if (m_Set_SyncViaAudioEnabled != 0)
{
SetSystemSetting(m_Set_SyncViaAudioEnabled, Enabled ? 1 : 0);
}
}
void CSettings::SetAudioEnabled(bool Enabled)
@ -152,7 +152,6 @@ void CSettings::LogLevelChanged(void)
void CSettings::ReadSettings(void)
{
bool SyncAudio = m_Set_SyncAudio ? GetSystemSetting(m_Set_SyncAudio) != 0 : false;
bool bLimitFPS = m_Set_LimitFPS ? GetSystemSetting(m_Set_LimitFPS) != 0 : true;
m_Volume = GetSetting(Set_Volume);
@ -163,7 +162,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);
m_SyncAudio = (!m_advanced_options || bLimitFPS);
if (m_Set_log_dir != 0)
{