sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Settings: Drop audio sync option

Browse Source 
Not relevant since time stretching was added.
This commit is contained in:
Connor McLaughlin
2022-08-05 17:57:46 +10:00
parent 57c1ca97f7
commit 1289064316
6 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/settings.cpp
View File

@@ -286,7 +286,6 @@ void Settings::Load(SettingsInterface& si)
audio_fast_forward_volume = si.GetUIntValue("Audio", "FastForwardVolume", 100);
audio_output_muted = si.GetBoolValue("Audio", "OutputMuted", false);
audio_sync_enabled = si.GetBoolValue("Audio", "Sync", true);
audio_dump_on_boot = si.GetBoolValue("Audio", "DumpOnBoot", false);
dma_max_slice_ticks = si.GetIntValue("Hacks", "DMAMaxSliceTicks", DEFAULT_DMA_MAX_SLICE_TICKS);
@@ -485,7 +484,6 @@ void Settings::Save(SettingsInterface& si) const
si.SetUIntValue("Audio", "OutputVolume", audio_output_volume);
si.SetUIntValue("Audio", "FastForwardVolume", audio_fast_forward_volume);
si.SetBoolValue("Audio", "OutputMuted", audio_output_muted);
si.SetBoolValue("Audio", "Sync", audio_sync_enabled);
si.SetBoolValue("Audio", "DumpOnBoot", audio_dump_on_boot);
si.SetIntValue("Hacks", "DMAMaxSliceTicks", dma_max_slice_ticks);

1
src/core/settings.h
View File

@@ -150,7 +150,6 @@ struct Settings
u32 audio_output_volume = 100;
u32 audio_fast_forward_volume = 100;
bool audio_output_muted = false;
bool audio_sync_enabled = true;
bool audio_dump_on_boot = false;
// timing hacks section

11
src/core/system.cpp
View File

@@ -2210,14 +2210,10 @@ void System::UpdateSpeedLimiterState()
}
}
const bool is_non_standard_speed = IsRunningAtNonStandardSpeed();
const bool audio_sync_enabled =
!IsRunning() || (m_throttler_enabled && g_settings.audio_sync_enabled && !is_non_standard_speed);
const bool video_sync_enabled = ShouldUseVSync();
const float max_display_fps = (!IsRunning() || m_throttler_enabled) ? 0.0f : g_settings.display_max_fps;
Log_InfoPrintf("Target speed: %f%%", target_speed * 100.0f);
Log_InfoPrintf("Syncing to %s%s", audio_sync_enabled ? "audio" : "",
(audio_sync_enabled && video_sync_enabled) ? " and video" : (video_sync_enabled ? "video" : ""));
Log_InfoPrintf("Using vsync: %s", video_sync_enabled ? "YES" : "NO");
Log_InfoPrintf("Max display fps: %f (%s)", max_display_fps,
m_display_all_frames ? "displaying all frames" : "skipping displaying frames when needed");
@@ -2234,10 +2230,6 @@ void System::UpdateSpeedLimiterState()
if (s_target_speed < target_speed)
stream->UpdateTargetTempo(target_speed);
// stream->SetSync(audio_sync_enabled);
// if (audio_sync_enabled)
// stream->EmptyBuffer();
s_target_speed = target_speed;
UpdateThrottlePeriod();
ResetThrottler();
@@ -3191,7 +3183,6 @@ void System::CheckForSettingsChanges(const Settings& old_settings)
if (g_settings.audio_backend != old_settings.audio_backend ||
g_settings.video_sync_enabled != old_settings.video_sync_enabled ||
g_settings.audio_sync_enabled != old_settings.audio_sync_enabled ||
g_settings.increase_timer_resolution != old_settings.increase_timer_resolution ||
g_settings.emulation_speed != old_settings.emulation_speed ||
g_settings.fast_forward_speed != old_settings.fast_forward_speed ||