State: Move logic of selected state to Core/State

1 files changed, 6 insertions, 15 deletions

diff --git a/Source/Android/jni/HotkeyScheduler.cpp b/Source/Android/jni/HotkeyScheduler.cpp
index 85d981f755..e4e44415b6 100644
--- a/Source/Android/jni/HotkeyScheduler.cpp
+++ b/Source/Android/jni/HotkeyScheduler.cpp
@@ -41,8 +41,6 @@ Common::Flag s_stop_requested;
 Common::Flag s_any_hotkey_set;
 Common::Event s_wakeup;
 
-int s_state_slot = 1;
-
 bool IsHotkey(int id, bool held = false)
 {
   return HotkeyManagerEmu::IsPressed(id, held);
@@ -117,13 +115,6 @@ void ShowInternalResolutionOSD(int new_efb_scale)
   }
 }
 
-void SetStateSlot(int slot)
-{
-  s_state_slot = slot;
-  Core::DisplayMessage(
-      fmt::format("Selected slot {} - {}", slot, State::GetInfoStringOfSlot(slot, false)), 2500);
-}
-
 void HandleGeneralHotkeys()
 {
   // TODO: add support for more general hotkeys
@@ -210,20 +201,20 @@ void HandleStateHotkeys(Core::System& system)
       State::LoadLastSaved(system, i + 1);
 
     if (IsHotkey(HK_SELECT_STATE_SLOT_1 + i))
-      SetStateSlot(i + 1);
+      State::SelectSlot(i + 1);
   }
 
   if (IsHotkey(HK_SAVE_STATE_SLOT_SELECTED))
-    State::Save(system, s_state_slot);
+    State::SaveSelected(system);
 
   if (IsHotkey(HK_LOAD_STATE_SLOT_SELECTED))
-    State::Load(system, s_state_slot);
+    State::LoadSelected(system);
 
   if (IsHotkey(HK_INCREMENT_SELECTED_STATE_SLOT))
-    SetStateSlot(s_state_slot + 1 > static_cast<int>(State::NUM_STATES) ? 1 : s_state_slot + 1);
+    State::SelectSlot(State::GetNextSlot());
 
   if (IsHotkey(HK_DECREMENT_SELECTED_STATE_SLOT))
-    SetStateSlot(s_state_slot - 1 < 1 ? static_cast<int>(State::NUM_STATES) : s_state_slot - 1);
+    State::SelectSlot(State::GetPreviousSlot());
 
   if (IsHotkey(HK_SAVE_FIRST_STATE))
     State::SaveFirstSaved(system);
@@ -288,7 +279,7 @@ void Start()
   if (s_thread.joinable())
     return;
 
-  s_state_slot = 1;
+  State::SetSelectedSlot(1);
   s_any_hotkey_set.Set(IsAnyHotkeySet());
   s_stop_requested.Clear();
   s_wakeup.Reset();