mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-09 15:49:25 +01:00
Merge pull request #12354 from Pokechu22/movie-extensionnumber
Use ExtensionNumber in Movie.cpp
This commit is contained in:
commit
96c256f97a
@ -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())
|
||||
|
@ -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<std::string>* 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();
|
||||
|
Loading…
x
Reference in New Issue
Block a user