Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 07:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Fix input profile loading/saving

Browse source
This commit is contained in:
Connor McLaughlin 2021-03-01 13:38:41 +10:00
parent 206735ca42
commit 5c5e9644d7
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
android/app/src/cpp/android_host_interface.cpp
View file

@ -257,8 +257,7 @@ void AndroidHostInterface::LoadSettings(SettingsInterface& si)
g_settings.gpu_per_sample_shading = StringUtil::EndsWith(msaa_str, "-ssaa"); g_settings.gpu_per_sample_shading = StringUtil::EndsWith(msaa_str, "-ssaa");
// turn percentage into fraction for overclock // turn percentage into fraction for overclock
const u32 overclock_percent = const u32 overclock_percent = static_cast<u32>(std::max(si.GetIntValue("CPU", "Overclock", 100), 1));
static_cast<u32>(std::max(si.GetIntValue("CPU", "Overclock", 100), 1));
Settings::CPUOverclockPercentToFraction(overclock_percent, &g_settings.cpu_overclock_numerator, Settings::CPUOverclockPercentToFraction(overclock_percent, &g_settings.cpu_overclock_numerator,
&g_settings.cpu_overclock_denominator); &g_settings.cpu_overclock_denominator);
g_settings.cpu_overclock_enable = (overclock_percent != 100); g_settings.cpu_overclock_enable = (overclock_percent != 100);
@ -1120,13 +1119,29 @@ DEFINE_JNI_ARGS_METHOD(jobjectArray, AndroidHostInterface_getInputProfileNames,
DEFINE_JNI_ARGS_METHOD(jboolean, AndroidHostInterface_loadInputProfile, jobject obj, jstring name) DEFINE_JNI_ARGS_METHOD(jboolean, AndroidHostInterface_loadInputProfile, jobject obj, jstring name)
{ {
AndroidHostInterface* hi = AndroidHelpers::GetNativeClass(env, obj); AndroidHostInterface* hi = AndroidHelpers::GetNativeClass(env, obj);
return hi->ApplyInputProfile(AndroidHelpers::JStringToString(env, name).c_str()); const std::string profile_name(AndroidHelpers::JStringToString(env, name));
if (profile_name.empty())
return false;
const std::string profile_path(hi->GetInputProfilePath(profile_name.c_str()));
if (profile_path.empty())
return false;
return hi->ApplyInputProfile(profile_path.c_str());
} }
DEFINE_JNI_ARGS_METHOD(jboolean, AndroidHostInterface_saveInputProfile, jobject obj, jstring name) DEFINE_JNI_ARGS_METHOD(jboolean, AndroidHostInterface_saveInputProfile, jobject obj, jstring name)
{ {
AndroidHostInterface* hi = AndroidHelpers::GetNativeClass(env, obj); AndroidHostInterface* hi = AndroidHelpers::GetNativeClass(env, obj);
return hi->SaveInputProfile(AndroidHelpers::JStringToString(env, name).c_str()); const std::string profile_name(AndroidHelpers::JStringToString(env, name));
if (profile_name.empty())
return false;
const std::string profile_path(hi->GetSavePathForInputProfile(profile_name.c_str()));
if (profile_path.empty())
return false;
return hi->SaveInputProfile(profile_path.c_str());
} }
DEFINE_JNI_ARGS_METHOD(void, AndroidHostInterface_refreshGameList, jobject obj, jboolean invalidate_cache, DEFINE_JNI_ARGS_METHOD(void, AndroidHostInterface_refreshGameList, jobject obj, jboolean invalidate_cache,
@ -1620,7 +1635,8 @@ DEFINE_JNI_ARGS_METHOD(jobjectArray, AndroidHostInterface_getSaveStateInfo, jobj
return ret; return ret;
} }
DEFINE_JNI_ARGS_METHOD(void, AndroidHostInterface_toggleControllerAnalogMode, jobject obj) { DEFINE_JNI_ARGS_METHOD(void, AndroidHostInterface_toggleControllerAnalogMode, jobject obj)
{
// hacky way to toggle analog mode // hacky way to toggle analog mode
for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++) for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++)
{ {