From cfcdaab51471ff1a3ef519b84efcde2a1f7f08a2 Mon Sep 17 00:00:00 2001 From: Joshua de Reeper Date: Wed, 26 Jun 2024 23:04:27 +0100 Subject: IOS/USB: Use Enum for Infinity Base Positions --- Source/Android/jni/InfinityConfig.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Source/Android') diff --git a/Source/Android/jni/InfinityConfig.cpp b/Source/Android/jni/InfinityConfig.cpp index 7be0402769..a5740537b0 100644 --- a/Source/Android/jni/InfinityConfig.cpp +++ b/Source/Android/jni/InfinityConfig.cpp @@ -10,6 +10,8 @@ #include "Core/IOS/USB/Emulated/Infinity.h" #include "Core/System.h" +using FigureUIPosition = IOS::HLE::USB::FigureUIPosition; + extern "C" { JNIEXPORT jobject JNICALL @@ -66,7 +68,7 @@ Java_org_dolphinemu_dolphinemu_features_infinitybase_InfinityConfig_removeFigure jint position) { auto& system = Core::System::GetInstance(); - system.GetInfinityBase().RemoveFigure(position); + system.GetInfinityBase().RemoveFigure(static_cast(position)); } JNIEXPORT jstring JNICALL @@ -87,9 +89,10 @@ Java_org_dolphinemu_dolphinemu_features_infinitybase_InfinityConfig_loadFigure(J } auto& system = Core::System::GetInstance(); - system.GetInfinityBase().RemoveFigure(position); + system.GetInfinityBase().RemoveFigure(static_cast(position)); return ToJString(env, - system.GetInfinityBase().LoadFigure(file_data, std::move(inf_file), position)); + system.GetInfinityBase().LoadFigure(file_data, std::move(inf_file), + static_cast(position))); } JNIEXPORT jstring JNICALL @@ -102,7 +105,7 @@ Java_org_dolphinemu_dolphinemu_features_infinitybase_InfinityConfig_createFigure auto& system = Core::System::GetInstance(); system.GetInfinityBase().CreateFigure(file_name, fig_num); - system.GetInfinityBase().RemoveFigure(position); + system.GetInfinityBase().RemoveFigure(static_cast(position)); File::IOFile inf_file(file_name, "r+b"); if (!inf_file) @@ -116,6 +119,7 @@ Java_org_dolphinemu_dolphinemu_features_infinitybase_InfinityConfig_createFigure } return ToJString(env, - system.GetInfinityBase().LoadFigure(file_data, std::move(inf_file), position)); + system.GetInfinityBase().LoadFigure(file_data, std::move(inf_file), + static_cast(position))); } } -- cgit v1.2.3