diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 5b66b707ea..6d9f3b4c8d 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -715,8 +715,8 @@ static void SetInputDisplayString(ControllerState padState, int controllerID) } // NOTE: CPU Thread -static void SetWiiInputDisplayString(int remoteID, const DataReportBuilder& rpt, int ext, - const EncryptionKey& key) +static void SetWiiInputDisplayString(int remoteID, const DataReportBuilder& rpt, + ExtensionNumber ext, const EncryptionKey& key) { int controllerID = remoteID + 4; @@ -897,7 +897,7 @@ void RecordInput(const GCPadStatus* PadStatus, int controllerID) } // NOTE: CPU Thread -void CheckWiimoteStatus(int wiimote, const DataReportBuilder& rpt, int ext, +void CheckWiimoteStatus(int wiimote, const DataReportBuilder& rpt, ExtensionNumber ext, const EncryptionKey& key) { SetWiiInputDisplayString(wiimote, rpt, ext, key); @@ -1297,7 +1297,7 @@ void PlayController(GCPadStatus* PadStatus, int controllerID) } // NOTE: CPU Thread -bool PlayWiimote(int wiimote, WiimoteCommon::DataReportBuilder& rpt, int ext, +bool PlayWiimote(int wiimote, WiimoteCommon::DataReportBuilder& rpt, ExtensionNumber ext, const EncryptionKey& key) { if (!IsPlayingInput() || !IsUsingWiimote(wiimote) || s_temp_input.empty()) diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index e5cc13f2bf..8bd00db823 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -29,7 +29,8 @@ class DataReportBuilder; namespace WiimoteEmu { class EncryptionKey; -} +enum ExtensionNumber : u8; +} // namespace WiimoteEmu // Per-(video )Movie actions @@ -185,15 +186,15 @@ bool PlayInput(const std::string& movie_path, std::optional* savest void LoadInput(const std::string& movie_path); void ReadHeader(); void PlayController(GCPadStatus* PadStatus, int controllerID); -bool PlayWiimote(int wiimote, WiimoteCommon::DataReportBuilder& rpt, int ext, - const WiimoteEmu::EncryptionKey& key); +bool PlayWiimote(int wiimote, WiimoteCommon::DataReportBuilder& rpt, + WiimoteEmu::ExtensionNumber ext, const WiimoteEmu::EncryptionKey& key); void EndPlayInput(bool cont); void SaveRecording(const std::string& filename); void DoState(PointerWrap& p); void Shutdown(); void CheckPadStatus(const GCPadStatus* PadStatus, int controllerID); -void CheckWiimoteStatus(int wiimote, const WiimoteCommon::DataReportBuilder& rpt, int ext, - const WiimoteEmu::EncryptionKey& key); +void CheckWiimoteStatus(int wiimote, const WiimoteCommon::DataReportBuilder& rpt, + WiimoteEmu::ExtensionNumber ext, const WiimoteEmu::EncryptionKey& key); std::string GetInputDisplay(); std::string GetRTCDisplay();