diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 3fda08091..45c9f9a5b 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -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); diff --git a/src/core/settings.h b/src/core/settings.h index 78655b2ba..eb36c7fa1 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -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 diff --git a/src/core/system.cpp b/src/core/system.cpp index 89ca98c9e..7c67fe52b 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -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 || diff --git a/src/duckstation-qt/audiosettingswidget.cpp b/src/duckstation-qt/audiosettingswidget.cpp index bffa66a21..d4227159c 100644 --- a/src/duckstation-qt/audiosettingswidget.cpp +++ b/src/duckstation-qt/audiosettingswidget.cpp @@ -20,7 +20,6 @@ AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.audioBackend, "Audio", "Backend", &Settings::ParseAudioBackend, &Settings::GetAudioBackendName, Settings::DEFAULT_AUDIO_BACKEND); - SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.syncToOutput, "Audio", "Sync", true); SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.stretchMode, "Audio", "StretchMode", &AudioStream::ParseStretchMode, &AudioStream::GetStretchModeName, Settings::DEFAULT_AUDIO_STRETCH_MODE); @@ -70,10 +69,6 @@ AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent "host. Smaller values reduce the output latency, but may cause hitches if the emulation " "speed is inconsistent. Note that the Cubeb backend uses smaller chunks regardless of " "this value, so using a low value here may not significantly change latency.")); - dialog->registerWidgetHelp(m_ui.syncToOutput, tr("Sync To Output"), tr("Checked"), - tr("Throttles the emulation speed based on the audio backend pulling audio frames. This " - "helps to remove noises or crackling if emulation is too fast. Sync will " - "automatically be disabled if not running at 100% speed.")); dialog->registerWidgetHelp( m_ui.startDumpingOnBoot, tr("Start Dumping On Boot"), tr("Unchecked"), tr("Start dumping audio to file as soon as the emulator is started. Mainly useful as a debug option.")); diff --git a/src/duckstation-qt/audiosettingswidget.ui b/src/duckstation-qt/audiosettingswidget.ui index e1c7fb3d1..902627f5d 100644 --- a/src/duckstation-qt/audiosettingswidget.ui +++ b/src/duckstation-qt/audiosettingswidget.ui @@ -39,7 +39,7 @@ - + Start Dumping On Boot @@ -126,13 +126,6 @@ - - - - Sync To Output - - - diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp index 36f41b1db..30e96787e 100644 --- a/src/frontend-common/fullscreen_ui.cpp +++ b/src/frontend-common/fullscreen_ui.cpp @@ -3185,11 +3185,6 @@ void FullscreenUI::DrawAudioSettingsPage() "Audio", "OutputLatencyMS", Settings::DEFAULT_AUDIO_OUTPUT_LATENCY_MS, 1, 500, "%d ms"); } - DrawToggleSetting("Sync To Output", - "Throttles the emulation speed based on the audio backend pulling audio " - "frames. Enable to reduce the chances of crackling.", - "Audio", "Sync", true); - EndMenuButtons(); }