history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-27 20:15:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "CommonHostInterface: Don't use sleep throttle when syncing to audio at standard speed"

Browse Source 
This reverts commit 922e17f6776aad24ea8886c7098b3e0a100c489f.
This commit is contained in:
Connor McLaughlin 2020-12-07 02:33:25 +10:00
parent 11d2b3a1a8
commit c8f33e340b
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/cpp/android_host_interface.cpp
View File

@ -424,7 +424,7 @@ void AndroidHostInterface::EmulationThreadLoop()
{ {
System::UpdatePerformanceCounters(); System::UpdatePerformanceCounters();
if (m_use_sleep_throttler) if (m_speed_limiter_enabled)
System::Throttle(); System::Throttle();
} }
} }

2
src/duckstation-qt/qthostinterface.cpp
View File

@ -1328,7 +1328,7 @@ void QtHostInterface::threadEntryPoint()
System::UpdatePerformanceCounters(); System::UpdatePerformanceCounters();
if (m_use_sleep_throttler) if (m_speed_limiter_enabled)
System::Throttle(); System::Throttle();
m_worker_thread_event_loop->processEvents(QEventLoop::AllEvents); m_worker_thread_event_loop->processEvents(QEventLoop::AllEvents);

2
src/duckstation-sdl/sdl_host_interface.cpp
View File

@ -1817,7 +1817,7 @@ void SDLHostInterface::Run()
{ {
System::UpdatePerformanceCounters(); System::UpdatePerformanceCounters();
if (m_use_sleep_throttler) if (m_speed_limiter_enabled)
System::Throttle(); System::Throttle();
} }
} }

20
src/frontend-common/common_host_interface.cpp
View File

@ -601,20 +601,16 @@ bool CommonHostInterface::ResumeSystemFromMostRecentState()
void CommonHostInterface::UpdateSpeedLimiterState() void CommonHostInterface::UpdateSpeedLimiterState()
{ {
const float target_speed = m_fast_forward_enabled ? g_settings.fast_forward_speed : g_settings.emulation_speed; const float target_speed = m_fast_forward_enabled ? g_settings.fast_forward_speed : g_settings.emulation_speed;
const bool speed_limiter_enabled = (target_speed != 0.0f); m_speed_limiter_enabled = (target_speed != 0.0f);
const bool is_non_standard_speed = (std::abs(target_speed - 1.0f) > 0.05f); const bool is_non_standard_speed = (std::abs(target_speed - 1.0f) > 0.05f);
const bool audio_sync_enabled = const bool audio_sync_enabled =
!System::IsRunning() || (speed_limiter_enabled && g_settings.audio_sync_enabled && !is_non_standard_speed); !System::IsRunning() || (m_speed_limiter_enabled && g_settings.audio_sync_enabled && !is_non_standard_speed);
const bool video_sync_enabled = const bool video_sync_enabled =
!System::IsRunning() || (speed_limiter_enabled && g_settings.video_sync_enabled && !is_non_standard_speed); !System::IsRunning() || (m_speed_limiter_enabled && g_settings.video_sync_enabled && !is_non_standard_speed);
const float max_display_fps = speed_limiter_enabled ? 0.0f : g_settings.display_max_fps; const float max_display_fps = m_speed_limiter_enabled ? 0.0f : g_settings.display_max_fps;
m_use_sleep_throttler = Log_InfoPrintf("Syncing to %s%s", audio_sync_enabled ? "audio" : "",
speed_limiter_enabled && (audio_sync_enabled && video_sync_enabled) ? " and video" : (video_sync_enabled ? "video" : ""));
(!audio_sync_enabled || g_settings.audio_backend == AudioBackend::Null || target_speed != 1.0f);
Log_InfoPrintf("Syncing to %s%s (%s)", audio_sync_enabled ? "audio" : "",
(audio_sync_enabled && video_sync_enabled) ? " and video" : (video_sync_enabled ? "video" : ""),
m_use_sleep_throttler ? "sleep throttler" : "no sleep throttler");
Log_InfoPrintf("Max display fps: %f", max_display_fps); Log_InfoPrintf("Max display fps: %f", max_display_fps);
if (m_audio_stream) if (m_audio_stream)
@ -631,11 +627,11 @@ void CommonHostInterface::UpdateSpeedLimiterState()
} }
if (g_settings.increase_timer_resolution) if (g_settings.increase_timer_resolution)
SetTimerResolutionIncreased(speed_limiter_enabled); SetTimerResolutionIncreased(m_speed_limiter_enabled);
if (System::IsValid()) if (System::IsValid())
{ {
System::SetTargetSpeed(speed_limiter_enabled ? target_speed : 1.0f); System::SetTargetSpeed(m_speed_limiter_enabled ? target_speed : 1.0f);
System::ResetPerformanceCounters(); System::ResetPerformanceCounters();
} }
} }

2
src/frontend-common/common_host_interface.h
View File

@ -345,7 +345,7 @@ protected:
bool m_frame_step_request = false; bool m_frame_step_request = false;
bool m_fast_forward_enabled = false; bool m_fast_forward_enabled = false;
bool m_timer_resolution_increased = false; bool m_timer_resolution_increased = false;
bool m_use_sleep_throttler = true; bool m_speed_limiter_enabled = true;
private: private:
void InitializeUserDirectory(); void InitializeUserDirectory();