From 27eab609dcc0619b8b00cdb544b903550f577099 Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Sun, 4 Jul 2021 12:55:37 +0200
Subject: [PATCH] GCController: Make HandleMoviePadStatus static

---
 Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp    |  2 +-
 Source/Core/Core/HW/SI/SI_DeviceGCController.cpp | 14 +++++++-------
 Source/Core/Core/HW/SI/SI_DeviceGCController.h   |  3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp
index 3f60b44cf7..a3f24824fb 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCAdapter.cpp
@@ -38,7 +38,7 @@ GCPadStatus CSIDevice_GCAdapter::GetPadStatus()
     pad_status = GCAdapter::Input(m_device_number);
   }
 
-  HandleMoviePadStatus(&pad_status);
+  HandleMoviePadStatus(m_device_number, &pad_status);
 
   // Our GCAdapter code sets PAD_GET_ORIGIN when a new device has been connected.
   // Watch for this to calibrate real controllers on connection.
diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
index 7a2b317f08..8c485f1a9f 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
@@ -108,27 +108,27 @@ int CSIDevice_GCController::RunBuffer(u8* buffer, int request_length)
   return 0;
 }
 
-void CSIDevice_GCController::HandleMoviePadStatus(GCPadStatus* pad_status)
+void CSIDevice_GCController::HandleMoviePadStatus(int device_number, GCPadStatus* pad_status)
 {
-  Movie::CallGCInputManip(pad_status, m_device_number);
+  Movie::CallGCInputManip(pad_status, device_number);
 
   Movie::SetPolledDevice();
-  if (NetPlay_GetInput(m_device_number, pad_status))
+  if (NetPlay_GetInput(device_number, pad_status))
   {
   }
   else if (Movie::IsPlayingInput())
   {
-    Movie::PlayController(pad_status, m_device_number);
+    Movie::PlayController(pad_status, device_number);
     Movie::InputUpdate();
   }
   else if (Movie::IsRecordingInput())
   {
-    Movie::RecordInput(pad_status, m_device_number);
+    Movie::RecordInput(pad_status, device_number);
     Movie::InputUpdate();
   }
   else
   {
-    Movie::CheckPadStatus(pad_status, m_device_number);
+    Movie::CheckPadStatus(pad_status, device_number);
   }
 }
 
@@ -143,7 +143,7 @@ GCPadStatus CSIDevice_GCController::GetPadStatus()
     pad_status = Pad::GetStatus(m_device_number);
   }
 
-  HandleMoviePadStatus(&pad_status);
+  HandleMoviePadStatus(m_device_number, &pad_status);
 
   // Our GCAdapter code sets PAD_GET_ORIGIN when a new device has been connected.
   // Watch for this to calibrate real controllers on connection.
diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.h b/Source/Core/Core/HW/SI/SI_DeviceGCController.h
index fa336d3357..9904e855bb 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceGCController.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.h
@@ -105,8 +105,9 @@ public:
   // Direct rumble to the right GC Controller
   static void Rumble(int pad_num, ControlState strength);
 
+  static void HandleMoviePadStatus(int device_number, GCPadStatus* pad_status);
+
 protected:
-  void HandleMoviePadStatus(GCPadStatus* pad_status);
   void SetOrigin(const GCPadStatus& pad_status);
 };