From afd49eb275aa4a8b9836d87b9700738b68cf8149 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Mon, 30 May 2022 09:32:18 -0700 Subject: [PATCH] blundered the build --- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp | 2 -- .../Core/DolphinQt/Settings/GeneralPane.cpp | 23 ------------------- Source/Core/DolphinQt/Settings/GeneralPane.h | 1 - 3 files changed, 26 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp index 7f29ec43f5..eacdff88eb 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp @@ -1732,8 +1732,6 @@ bool CEXISlippi::shouldAdvanceOnlineFrame(s32 frame) deviation = frameWindowMultiplier * -maxSlowDownAmount; } - auto dynamicEmulationSpeed = 1.0f + deviation; - // If we are behind (negative offset) we want to go above 100% run speed, so we need to subtract // the deviation value auto dynamicEmulationSpeed = 1.0f - deviation; diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp index 64c2552a7c..961ed2d682 100644 --- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp +++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp @@ -239,29 +239,6 @@ void GeneralPane::LoadConfig() m_combobox_fallback_region->setCurrentIndex(FALLBACK_REGION_NTSCJ_INDEX); } -static QString UpdateTrackFromIndex(int index) -{ - QString value; - - switch (index) - { - case AUTO_UPDATE_DISABLE_INDEX: - value = QString::fromStdString(AUTO_UPDATE_DISABLE_STRING); - break; - case AUTO_UPDATE_STABLE_INDEX: - value = QString::fromStdString(AUTO_UPDATE_STABLE_STRING); - break; - case AUTO_UPDATE_BETA_INDEX: - value = QString::fromStdString(AUTO_UPDATE_BETA_STRING); - break; - case AUTO_UPDATE_DEV_INDEX: - value = QString::fromStdString(AUTO_UPDATE_DEV_STRING); - break; - } - - return value; -} - static DiscIO::Region UpdateFallbackRegionFromIndex(int index) { DiscIO::Region value = DiscIO::Region::Unknown; diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.h b/Source/Core/DolphinQt/Settings/GeneralPane.h index eac69bf92c..519b00a57a 100644 --- a/Source/Core/DolphinQt/Settings/GeneralPane.h +++ b/Source/Core/DolphinQt/Settings/GeneralPane.h @@ -29,7 +29,6 @@ private: void CreateLayout(); void ConnectLayout(); void CreateBasic(); - void CreateAutoUpdate(); void CreateFallbackRegion(); void LoadConfig();