From cb023db3944dd9254ee985f90a6106efcf8fd305 Mon Sep 17 00:00:00 2001 From: izzy2lost Date: Tue, 21 Oct 2025 10:07:40 -0400 Subject: [PATCH] more name changes --- .../app/src/main/cpp/NativeAccount.cpp | 16 +-- .../app/src/main/cpp/NativeActiveSettings.cpp | 12 +- .../app/src/main/cpp/NativeEmulation.cpp | 20 +-- .../app/src/main/cpp/NativeGameTitles.cpp | 48 +++---- .../app/src/main/cpp/NativeGraphicPacks.cpp | 12 +- src/android/app/src/main/cpp/NativeInput.cpp | 40 +++--- .../app/src/main/cpp/NativeLocalization.cpp | 2 +- .../app/src/main/cpp/NativeLogging.cpp | 4 +- .../app/src/main/cpp/NativeSettings.cpp | 122 +++++++++--------- src/android/app/src/main/cpp/NativeSwkbd.cpp | 8 +- 10 files changed, 142 insertions(+), 142 deletions(-) diff --git a/src/android/app/src/main/cpp/NativeAccount.cpp b/src/android/app/src/main/cpp/NativeAccount.cpp index e35545a6..e66c8d4b 100644 --- a/src/android/app/src/main/cpp/NativeAccount.cpp +++ b/src/android/app/src/main/cpp/NativeAccount.cpp @@ -17,7 +17,7 @@ #include "Cemu/ncrypto/ncrypto.h" extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeAccount_createAccount(JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id, jstring mii_name) +Java_com_izzy2lost_weeu_nativeinterface_NativeAccount_createAccount(JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id, jstring mii_name) { uint32 persistentId = static_cast(persistent_id); std::string miiName = JNIUtils::toString(env, mii_name); @@ -27,7 +27,7 @@ Java_info_cemu_cemu_nativeinterface_NativeAccount_createAccount(JNIEnv* env, [[m } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeAccount_deleteAccount([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeAccount_deleteAccount([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id) { uint32 persistentId = static_cast(persistent_id); const auto& account = Account::GetAccount(persistentId); @@ -50,7 +50,7 @@ Java_info_cemu_cemu_nativeinterface_NativeAccount_deleteAccount([[maybe_unused]] } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeAccount_saveAccount(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject account_java) +Java_com_izzy2lost_weeu_nativeinterface_NativeAccount_saveAccount(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject account_java) { using namespace std::chrono; @@ -98,7 +98,7 @@ jlong toUnixTimestampMillis(std::chrono::year_month_day ymd) } extern "C" [[maybe_unused]] JNIEXPORT jobjectArray JNICALL -Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccounts(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeAccount_getAccounts(JNIEnv* env, [[maybe_unused]] jclass clazz) { using namespace std::chrono; jclass accountClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeAccount$Account"); @@ -136,7 +136,7 @@ Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccounts(JNIEnv* env, [[may } extern "C" [[maybe_unused]] JNIEXPORT jobjectArray JNICALL -Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccountCountries(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeAccount_getAccountCountries(JNIEnv* env, [[maybe_unused]] jclass clazz) { jclass countryClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeAccount$AccountCountry"); jmethodID countryCtrId = env->GetMethodID(countryClass, "", "(ILjava/lang/String;)V"); @@ -172,7 +172,7 @@ Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccountCountries(JNIEnv* en } extern "C" [[maybe_unused]] JNIEXPORT jobjectArray JNICALL -Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccountValidationErrors(JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeAccount_getAccountValidationErrors(JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id) { using ErrorType = std::pair; auto getErrorType = [&](const char* className, const char* ctrSig = "()V") -> ErrorType { @@ -244,13 +244,13 @@ Java_info_cemu_cemu_nativeinterface_NativeAccount_getAccountValidationErrors(JNI } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeAccount_isOTPPresent([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeAccount_isOTPPresent([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return NCrypto::OTP_IsPresent(); } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeAccount_isSEEPROMPresent([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeAccount_isSEEPROMPresent([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return NCrypto::SEEPROM_IsPresent(); } \ No newline at end of file diff --git a/src/android/app/src/main/cpp/NativeActiveSettings.cpp b/src/android/app/src/main/cpp/NativeActiveSettings.cpp index 2709c682..c0185702 100644 --- a/src/android/app/src/main/cpp/NativeActiveSettings.cpp +++ b/src/android/app/src/main/cpp/NativeActiveSettings.cpp @@ -2,19 +2,19 @@ #include "config/ActiveSettings.h" extern "C" [[maybe_unused]] JNIEXPORT jstring JNICALL -Java_info_cemu_cemu_nativeinterface_NativeActiveSettings_getMLCPath(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeActiveSettings_getMLCPath(JNIEnv* env, [[maybe_unused]] jclass clazz) { return JNIUtils::toJString(env, ActiveSettings::GetMlcPath()); } extern "C" [[maybe_unused]] JNIEXPORT jstring JNICALL -Java_info_cemu_cemu_nativeinterface_NativeActiveSettings_getUserDataPath(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeActiveSettings_getUserDataPath(JNIEnv* env, [[maybe_unused]] jclass clazz) { return JNIUtils::toJString(env, ActiveSettings::GetUserDataPath()); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeActiveSettings_initializeActiveSettings(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring user_data_path, jstring data_path, jstring cache_path) +Java_com_izzy2lost_weeu_nativeinterface_NativeActiveSettings_initializeActiveSettings(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring user_data_path, jstring data_path, jstring cache_path) { std::string userDataPath = JNIUtils::toString(env, user_data_path); std::string dataPath = JNIUtils::toString(env, data_path); @@ -24,19 +24,19 @@ Java_info_cemu_cemu_nativeinterface_NativeActiveSettings_initializeActiveSetting } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeActiveSettings_setNativeLibDir(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring native_lib_dir) +Java_com_izzy2lost_weeu_nativeinterface_NativeActiveSettings_setNativeLibDir(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring native_lib_dir) { ActiveSettings::SetNativeLibPath(JNIUtils::toString(env, native_lib_dir)); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeActiveSettings_setInternalDir(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring internal_dir) +Java_com_izzy2lost_weeu_nativeinterface_NativeActiveSettings_setInternalDir(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring internal_dir) { ActiveSettings::SetInternalDir(JNIUtils::toString(env, internal_dir)); } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeActiveSettings_hasRequiredOnlineFiles(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeActiveSettings_hasRequiredOnlineFiles(JNIEnv* env, [[maybe_unused]] jclass clazz) { return ActiveSettings::HasRequiredOnlineFiles(); } \ No newline at end of file diff --git a/src/android/app/src/main/cpp/NativeEmulation.cpp b/src/android/app/src/main/cpp/NativeEmulation.cpp index db83f94a..a06f353a 100644 --- a/src/android/app/src/main/cpp/NativeEmulation.cpp +++ b/src/android/app/src/main/cpp/NativeEmulation.cpp @@ -152,14 +152,14 @@ namespace NativeEmulation } // namespace NativeEmulation extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_setReplaceTVWithPadView([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean swapped) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_setReplaceTVWithPadView([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean swapped) { // Emulate pressing the TAB key for showing DRC instead of TV WindowSystem::GetWindowInfo().set_keystate(static_cast(WindowSystem::PlatformKeyCodes::TAB), swapped); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_initializeEmulation([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_initializeEmulation([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { FilesystemAndroid::SetFilesystemCallbacks(std::make_shared()); GetConfigHandle().SetFilename(ActiveSettings::GetConfigPath("settings.xml").generic_wstring()); @@ -171,7 +171,7 @@ Java_info_cemu_cemu_nativeinterface_NativeEmulation_initializeEmulation([[maybe_ } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_initializeRenderer(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject j_testSurface) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_initializeRenderer(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject j_testSurface) { InitializeGlobalVulkan(); using ANativewindow_Ptr = std::unique_ptr; @@ -186,14 +186,14 @@ Java_info_cemu_cemu_nativeinterface_NativeEmulation_initializeRenderer(JNIEnv* e } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_setDPI([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jfloat dpi) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_setDPI([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jfloat dpi) { auto& windowInfo = WindowSystem::GetWindowInfo(); windowInfo.dpi_scale = windowInfo.pad_dpi_scale = dpi; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_clearSurface([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean is_main_canvas) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_clearSurface([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean is_main_canvas) { if (!is_main_canvas) { @@ -203,19 +203,19 @@ Java_info_cemu_cemu_nativeinterface_NativeEmulation_clearSurface([[maybe_unused] } } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_recreateRenderSurface([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean is_main_canvas) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_recreateRenderSurface([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean is_main_canvas) { // TODO } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_supportsLoadingCustomDriver([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_supportsLoadingCustomDriver([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return SupportsLoadingCustomDriver(); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_setSurface(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject surface, jboolean is_main_canvas) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_setSurface(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject surface, jboolean is_main_canvas) { JNIUtils::handleNativeException(env, [&]() { cemu_assert_debug(surface != nullptr); @@ -237,7 +237,7 @@ Java_info_cemu_cemu_nativeinterface_NativeEmulation_setSurface(JNIEnv* env, [[ma } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_setSurfaceSize([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint width, jint height, jboolean is_main_canvas) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_setSurfaceSize([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint width, jint height, jboolean is_main_canvas) { auto& windowInfo = WindowSystem::GetWindowInfo(); if (is_main_canvas) @@ -253,7 +253,7 @@ Java_info_cemu_cemu_nativeinterface_NativeEmulation_setSurfaceSize([[maybe_unuse } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeEmulation_startGame([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jstring launchPath) +Java_com_izzy2lost_weeu_nativeinterface_NativeEmulation_startGame([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jstring launchPath) { WindowSystem::GetWindowInfo().set_keystatesup(); NativeEmulation::initializeAudioDevices(); diff --git a/src/android/app/src/main/cpp/NativeGameTitles.cpp b/src/android/app/src/main/cpp/NativeGameTitles.cpp index 8bb104e5..840e84b1 100644 --- a/src/android/app/src/main/cpp/NativeGameTitles.cpp +++ b/src/android/app/src/main/cpp/NativeGameTitles.cpp @@ -42,14 +42,14 @@ namespace NativeGameTitles } // namespace NativeGameTitles extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_isLoadingSharedLibrariesForTitleEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_isLoadingSharedLibrariesForTitleEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) { NativeGameTitles::LoadGameProfile(game_title_id); return NativeGameTitles::s_currentGameProfile.ShouldLoadSharedLibraries().value_or(false); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setLoadingSharedLibrariesForTitleEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_setLoadingSharedLibrariesForTitleEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jboolean enabled) { NativeGameTitles::LoadGameProfile(game_title_id); NativeGameTitles::s_currentGameProfile.SetShouldLoadSharedLibraries(enabled); @@ -57,14 +57,14 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setLoadingSharedLibrariesFo } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_getCpuModeForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_getCpuModeForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) { NativeGameTitles::LoadGameProfile(game_title_id); return static_cast(NativeGameTitles::s_currentGameProfile.GetCPUMode().value_or(CPUMode::Auto)); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setCpuModeForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jint cpu_mode) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_setCpuModeForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jint cpu_mode) { NativeGameTitles::LoadGameProfile(game_title_id); NativeGameTitles::s_currentGameProfile.SetCPUMode(static_cast(cpu_mode)); @@ -72,14 +72,14 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setCpuModeForTitle([[maybe_ } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_getThreadQuantumForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_getThreadQuantumForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) { NativeGameTitles::LoadGameProfile(game_title_id); return NativeGameTitles::s_currentGameProfile.GetThreadQuantum(); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setThreadQuantumForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jint thread_quantum) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_setThreadQuantumForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jint thread_quantum) { NativeGameTitles::LoadGameProfile(game_title_id); NativeGameTitles::s_currentGameProfile.SetThreadQuantum(std::clamp(thread_quantum, 5000, 536870912)); @@ -87,14 +87,14 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setThreadQuantumForTitle([[ } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_isShaderMultiplicationAccuracyForTitleEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_isShaderMultiplicationAccuracyForTitleEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) { NativeGameTitles::LoadGameProfile(game_title_id); return NativeGameTitles::s_currentGameProfile.GetAccurateShaderMul() == AccurateShaderMulOption::True; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setShaderMultiplicationAccuracyForTitleEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_setShaderMultiplicationAccuracyForTitleEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jboolean enabled) { NativeGameTitles::LoadGameProfile(game_title_id); NativeGameTitles::s_currentGameProfile.SetAccurateShaderMul(enabled ? AccurateShaderMulOption::True : AccurateShaderMulOption::False); @@ -102,13 +102,13 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setShaderMultiplicationAccu } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_titleHasShaderCacheFiles([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_titleHasShaderCacheFiles([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) { return !NativeGameTitles::getCachesPaths(game_title_id).empty(); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_removeShaderCacheFilesForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_removeShaderCacheFilesForTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id) { std::error_code ec; for (auto&& cacheFilePath : NativeGameTitles::getCachesPaths(game_title_id)) @@ -116,13 +116,13 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_removeShaderCacheFilesForTi } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setGameTitleFavorite([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jboolean isFavorite) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_setGameTitleFavorite([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong game_title_id, jboolean isFavorite) { GetConfig().SetGameListFavorite(game_title_id, isFavorite); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setGameTitleLoadedCallback(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject game_title_loaded_callback) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_setGameTitleLoadedCallback(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject game_title_loaded_callback) { if (game_title_loaded_callback == nullptr) { @@ -136,13 +136,13 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setGameTitleLoadedCallback( } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_reloadGameTitles([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_reloadGameTitles([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { NativeGameTitles::s_gameTitleLoader.reloadGameTitles(); } extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_getInstalledGamesTitleIds(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_getInstalledGamesTitleIds(JNIEnv* env, [[maybe_unused]] jclass clazz) { return JNIUtils::createJavaLongArrayList(env, CafeTitleList::GetAllTitleIds()); } @@ -301,7 +301,7 @@ class TitleListCallbacks }; extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_refreshCafeTitleList([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_refreshCafeTitleList([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { CafeTitleList::Refresh(); } @@ -309,7 +309,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_refreshCafeTitleList([[mayb std::unique_ptr s_titleListCallbacks; extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setTitleListCallbacks([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jobject title_list_callbacks) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_setTitleListCallbacks([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jobject title_list_callbacks) { if (title_list_callbacks == nullptr) s_titleListCallbacks = nullptr; @@ -320,7 +320,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setTitleListCallbacks([[may std::unique_ptr s_saveListCallback; extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setSaveListCallback([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jobject save_list_callback) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_setSaveListCallback([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jobject save_list_callback) { if (save_list_callback == nullptr) s_saveListCallback = nullptr; @@ -329,7 +329,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_setSaveListCallback([[maybe } extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_checkIfTitleExists(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring meta_path) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_checkIfTitleExists(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring meta_path) { TitleInfo titleInfo(fs::path(JNIUtils::toString(env, meta_path))); @@ -398,7 +398,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_checkIfTitleExists(JNIEnv* } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_addTitleFromPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring path) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_addTitleFromPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring path) { CafeTitleList::AddTitleFromPath(fs::path(JNIUtils::toString(env, path))); } @@ -410,7 +410,7 @@ struct Title }; extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_queueTitleToCompress(JNIEnv* env, [[maybe_unused]] jclass clazz, jlong titleId, jlong selectedUID, jobject titlesCallback) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_queueTitleToCompress(JNIEnv* env, [[maybe_unused]] jclass clazz, jlong titleId, jlong selectedUID, jobject titlesCallback) { jclass titlesCallbackClass = env->GetObjectClass(titlesCallback); jmethodID getTitlesMID = env->GetMethodID(titlesCallbackClass, "getTitlesByTitleId", "(J)[Lcom/izzy2lost/weeu/nativeinterface/NativeGameTitles$TitleIdToTitlesCallback$Title;"); @@ -511,7 +511,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_queueTitleToCompress(JNIEnv } extern "C" [[maybe_unused]] JNIEXPORT jstring JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_getCompressedFileNameForQueuedTitle(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_getCompressedFileNameForQueuedTitle(JNIEnv* env, [[maybe_unused]] jclass clazz) { if (NativeGameTitles::s_wuaConverter == nullptr) return nullptr; @@ -519,7 +519,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_getCompressedFileNameForQue } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_compressQueuedTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint fd, jobject compressTitleCallbacks) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_compressQueuedTitle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint fd, jobject compressTitleCallbacks) { if (NativeGameTitles::s_wuaConverter == nullptr) return; @@ -527,7 +527,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_compressQueuedTitle([[maybe } extern "C" [[maybe_unused]] JNIEXPORT jlong JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_getCurrentProgressForCompression([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_getCurrentProgressForCompression([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { if (NativeGameTitles::s_wuaConverter == nullptr) return 0L; @@ -535,7 +535,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGameTitles_getCurrentProgressForCompre } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGameTitles_cancelTitleCompression([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeGameTitles_cancelTitleCompression([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { if (NativeGameTitles::s_wuaConverter == nullptr) return; diff --git a/src/android/app/src/main/cpp/NativeGraphicPacks.cpp b/src/android/app/src/main/cpp/NativeGraphicPacks.cpp index bea70365..30162011 100644 --- a/src/android/app/src/main/cpp/NativeGraphicPacks.cpp +++ b/src/android/app/src/main/cpp/NativeGraphicPacks.cpp @@ -85,7 +85,7 @@ namespace NativeGraphicPacks } // namespace NativeGraphicPacks extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_refreshGraphicPacks([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeGraphicPacks_refreshGraphicPacks([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { if (!CafeSystem::IsTitleRunning()) { @@ -96,7 +96,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_refreshGraphicPacks([[may } extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_getGraphicPackBasicInfos(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeGraphicPacks_getGraphicPackBasicInfos(JNIEnv* env, [[maybe_unused]] jclass clazz) { auto graphicPackInfoClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeGraphicPacks$GraphicPackBasicInfo"); auto graphicPackInfoCtorId = env->GetMethodID(graphicPackInfoClass, "", "(JLjava/lang/String;ZLjava/util/ArrayList;)V"); @@ -115,7 +115,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_getGraphicPackBasicInfos( } extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_getGraphicPack(JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id) +Java_com_izzy2lost_weeu_nativeinterface_NativeGraphicPacks_getGraphicPack(JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id) { auto graphicPackClass = env->FindClass("com/izzy2lost/weeu/nativeinterface/NativeGraphicPacks$GraphicPack"); auto graphicPackCtorId = env->GetMethodID(graphicPackClass, "", "(JZLjava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;)V"); @@ -134,7 +134,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_getGraphicPack(JNIEnv* en } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_setGraphicPackActive([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id, jboolean active) +Java_com_izzy2lost_weeu_nativeinterface_NativeGraphicPacks_setGraphicPackActive([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id, jboolean active) { auto graphicPack = NativeGraphicPacks::s_graphicPacks.at(id); graphicPack->SetEnabled(active); @@ -142,7 +142,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_setGraphicPackActive([[ma } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_setGraphicPackActivePreset([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id, jstring category, jstring preset) +Java_com_izzy2lost_weeu_nativeinterface_NativeGraphicPacks_setGraphicPackActivePreset([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id, jstring category, jstring preset) { std::string presetCategory = category == nullptr ? "" : JNIUtils::toString(env, category); auto graphicPack = NativeGraphicPacks::s_graphicPacks.at(id); @@ -151,7 +151,7 @@ Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_setGraphicPackActivePrese } extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL -Java_info_cemu_cemu_nativeinterface_NativeGraphicPacks_getGraphicPackPresets(JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id) +Java_com_izzy2lost_weeu_nativeinterface_NativeGraphicPacks_getGraphicPackPresets(JNIEnv* env, [[maybe_unused]] jclass clazz, jlong id) { return NativeGraphicPacks::getGraphicPresets(env, NativeGraphicPacks::s_graphicPacks.at(id), id); } \ No newline at end of file diff --git a/src/android/app/src/main/cpp/NativeInput.cpp b/src/android/app/src/main/cpp/NativeInput.cpp index 3e2cea2a..73d36346 100644 --- a/src/android/app/src/main/cpp/NativeInput.cpp +++ b/src/android/app/src/main/cpp/NativeInput.cpp @@ -22,7 +22,7 @@ namespace NativeInput } // namespace NativeInput extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_onNativeKey(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint key, jboolean is_pressed) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_onNativeKey(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint key, jboolean is_pressed) { auto deviceDescriptor = JNIUtils::toString(env, device_descriptor); auto deviceName = JNIUtils::toString(env, device_name); @@ -32,7 +32,7 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_onNativeKey(JNIEnv* env, [[maybe } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_onNativeAxis(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint axis, jfloat value) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_onNativeAxis(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint axis, jfloat value) { auto deviceDescriptor = JNIUtils::toString(env, device_descriptor); auto deviceName = JNIUtils::toString(env, device_name); @@ -42,7 +42,7 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_onNativeAxis(JNIEnv* env, [[mayb } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_setControllerType([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index, jint emulated_controller_type) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_setControllerType([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index, jint emulated_controller_type) { auto type = static_cast(emulated_controller_type); auto& androidEmulatedController = AndroidEmulatedController::getAndroidEmulatedController(index); @@ -53,7 +53,7 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_setControllerType([[maybe_unused } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_getControllerType([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_getControllerType([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index) { auto emulatedController = AndroidEmulatedController::getAndroidEmulatedController(index).getEmulatedController(); if (emulatedController) @@ -62,7 +62,7 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_getControllerType([[maybe_unused } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_getWPADControllersCount([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_getWPADControllersCount([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { int wpadCount = 0; for (size_t i = 0; i < InputManager::kMaxController; i++) @@ -77,7 +77,7 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_getWPADControllersCount([[maybe_ } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_getVPADControllersCount([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_getVPADControllersCount([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { int vpadCount = 0; for (size_t i = 0; i < InputManager::kMaxController; i++) @@ -92,7 +92,7 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_getVPADControllersCount([[maybe_ } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_setVPADScreenToggle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_setVPADScreenToggle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index, jboolean enabled) { auto emulatedController = AndroidEmulatedController::getAndroidEmulatedController(index).getEmulatedController(); if (emulatedController == nullptr || emulatedController->type() != EmulatedController::Type::VPAD) @@ -101,7 +101,7 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_setVPADScreenToggle([[maybe_unus } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_getVPADScreenToggle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_getVPADScreenToggle([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index) { auto emulatedController = AndroidEmulatedController::getAndroidEmulatedController(index).getEmulatedController(); if (emulatedController == nullptr || emulatedController->type() != EmulatedController::Type::VPAD) @@ -110,13 +110,13 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_getVPADScreenToggle([[maybe_unus } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_isControllerDisabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_isControllerDisabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index) { return AndroidEmulatedController::getAndroidEmulatedController(index).getEmulatedController() == nullptr; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_setControllerMapping(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint index, jint mapping_id, jint button_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_setControllerMapping(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring device_descriptor, jstring device_name, jint index, jint mapping_id, jint button_id) { auto deviceName = JNIUtils::toString(env, device_name); auto deviceDescriptor = JNIUtils::toString(env, device_descriptor); @@ -126,20 +126,20 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_setControllerMapping(JNIEnv* env } extern "C" [[maybe_unused]] JNIEXPORT jstring JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_getControllerMapping(JNIEnv* env, [[maybe_unused]] jclass clazz, jint index, jint mapping_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_getControllerMapping(JNIEnv* env, [[maybe_unused]] jclass clazz, jint index, jint mapping_id) { auto mapping = AndroidEmulatedController::getAndroidEmulatedController(index).getMapping(mapping_id); return JNIUtils::toJString(env, mapping.value_or("")); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_clearControllerMapping([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index, jint mapping_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_clearControllerMapping([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint index, jint mapping_id) { AndroidEmulatedController::getAndroidEmulatedController(index).clearMapping(mapping_id); } extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_getControllerMappings(JNIEnv* env, [[maybe_unused]] jclass clazz, jint index) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_getControllerMappings(JNIEnv* env, [[maybe_unused]] jclass clazz, jint index) { jclass hashMapClass = env->FindClass("java/util/HashMap"); jmethodID hashMapConstructor = env->GetMethodID(hashMapClass, "", "()V"); @@ -159,25 +159,25 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_getControllerMappings(JNIEnv* en } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_onTouchDown([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint x, jint y, jboolean isTV) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_onTouchDown([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint x, jint y, jboolean isTV) { NativeInput::onTouchEvent(x, y, isTV, true); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_onTouchUp([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint x, jint y, jboolean isTV) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_onTouchUp([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint x, jint y, jboolean isTV) { NativeInput::onTouchEvent(x, y, isTV, false); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_onTouchMove([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint x, jint y, jboolean isTV) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_onTouchMove([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint x, jint y, jboolean isTV) { NativeInput::onTouchEvent(x, y, isTV); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_onMotion([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong timestamp, jfloat gyroX, jfloat gyroY, jfloat gyroZ, jfloat accelX, jfloat accelY, jfloat accelZ) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_onMotion([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jlong timestamp, jfloat gyroX, jfloat gyroY, jfloat gyroZ, jfloat accelX, jfloat accelY, jfloat accelZ) { static constexpr float METERS_PER_SECOND_SQ_TO_G = 1.f / 9.81f; float deltaTime = (timestamp - NativeInput::s_lastMotionTimestamp) * 1e-9f; @@ -189,7 +189,7 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_onMotion([[maybe_unused]] JNIEnv } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_setMotionEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean motionEnabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_setMotionEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean motionEnabled) { auto& deviceMotion = InputManager::instance().m_device_motion; std::scoped_lock lock{deviceMotion.m_mutex}; @@ -197,13 +197,13 @@ Java_info_cemu_cemu_nativeinterface_NativeInput_setMotionEnabled([[maybe_unused] } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_onOverlayButton([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint controllerIndex, jint mappingId, jboolean state) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_onOverlayButton([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint controllerIndex, jint mappingId, jboolean state) { AndroidEmulatedController::getAndroidEmulatedController(controllerIndex).setButtonValue(mappingId, state); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeInput_onOverlayAxis([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint controllerIndex, jint mappingId, jfloat value) +Java_com_izzy2lost_weeu_nativeinterface_NativeInput_onOverlayAxis([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint controllerIndex, jint mappingId, jfloat value) { AndroidEmulatedController::getAndroidEmulatedController(controllerIndex).setAxisValue(mappingId, value); } \ No newline at end of file diff --git a/src/android/app/src/main/cpp/NativeLocalization.cpp b/src/android/app/src/main/cpp/NativeLocalization.cpp index 3067098f..a7d31971 100644 --- a/src/android/app/src/main/cpp/NativeLocalization.cpp +++ b/src/android/app/src/main/cpp/NativeLocalization.cpp @@ -16,7 +16,7 @@ namespace NativeLocalization } // namespace NativeLocalization extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeLocalization_setTranslations(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject translations) +Java_com_izzy2lost_weeu_nativeinterface_NativeLocalization_setTranslations(JNIEnv* env, [[maybe_unused]] jclass clazz, jobject translations) { NativeLocalization::g_messages.clear(); diff --git a/src/android/app/src/main/cpp/NativeLogging.cpp b/src/android/app/src/main/cpp/NativeLogging.cpp index 02d0dc87..f8caf00d 100644 --- a/src/android/app/src/main/cpp/NativeLogging.cpp +++ b/src/android/app/src/main/cpp/NativeLogging.cpp @@ -2,13 +2,13 @@ #include "JNIUtils.h" extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeLogging_log(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring message) +Java_com_izzy2lost_weeu_nativeinterface_NativeLogging_log(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring message) { cemuLog_log(LogType::Force, JNIUtils::toString(env, message)); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeLogging_crashLog(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring stacktrace) +Java_com_izzy2lost_weeu_nativeinterface_NativeLogging_crashLog(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring stacktrace) { if (!CrashLog_Create()) return; // give up if crashlog was already created diff --git a/src/android/app/src/main/cpp/NativeSettings.cpp b/src/android/app/src/main/cpp/NativeSettings.cpp index 64a62014..14abedd1 100644 --- a/src/android/app/src/main/cpp/NativeSettings.cpp +++ b/src/android/app/src/main/cpp/NativeSettings.cpp @@ -4,175 +4,175 @@ #include "config/NetworkSettings.h" extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getOverlayPosition([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getOverlayPosition([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return static_cast(GetConfig().overlay.position); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayPosition([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint position) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayPosition([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint position) { GetConfig().overlay.position = static_cast(position); } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getOverlayTextScalePercentage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getOverlayTextScalePercentage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().overlay.text_scale; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayTextScalePercentage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint scalePercentage) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayTextScalePercentage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint scalePercentage) { GetConfig().overlay.text_scale = scalePercentage; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isOverlayFPSEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isOverlayFPSEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().overlay.fps; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayFPSEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayFPSEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().overlay.fps = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isOverlayDrawCallsPerFrameEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isOverlayDrawCallsPerFrameEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().overlay.drawcalls; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayDrawCallsPerFrameEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayDrawCallsPerFrameEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().overlay.drawcalls = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isOverlayCPUUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isOverlayCPUUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().overlay.cpu_usage; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayCPUUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayCPUUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().overlay.cpu_usage = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isOverlayCPUPerCoreUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isOverlayCPUPerCoreUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().overlay.cpu_per_core_usage; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayCPUPerCoreUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayCPUPerCoreUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().overlay.cpu_per_core_usage = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isOverlayRAMUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isOverlayRAMUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().overlay.ram_usage; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayRAMUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayRAMUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().overlay.ram_usage = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isOverlayVRAMUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isOverlayVRAMUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().overlay.vram_usage; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayVRAMUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayVRAMUsageEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().overlay.vram_usage = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isOverlayDebugEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isOverlayDebugEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().overlay.debug; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setOverlayDebugEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setOverlayDebugEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().overlay.debug = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getNotificationsPosition([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getNotificationsPosition([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return static_cast(GetConfig().notification.position); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setNotificationsPosition([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint position) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setNotificationsPosition([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint position) { GetConfig().notification.position = static_cast(position); } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getNotificationsTextScalePercentage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getNotificationsTextScalePercentage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().notification.text_scale; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setNotificationsTextScalePercentage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint scalePercentage) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setNotificationsTextScalePercentage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint scalePercentage) { GetConfig().notification.text_scale = scalePercentage; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isNotificationControllerProfilesEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isNotificationControllerProfilesEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().notification.controller_profiles; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setNotificationControllerProfilesEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setNotificationControllerProfilesEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().notification.controller_profiles = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isNotificationShaderCompilerEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isNotificationShaderCompilerEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().notification.shader_compiling; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setNotificationShaderCompilerEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setNotificationShaderCompilerEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().notification.shader_compiling = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_isNotificationFriendListEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_isNotificationFriendListEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().notification.friends; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setNotificationFriendListEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setNotificationFriendListEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().notification.friends = enabled; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_addGamesPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring uri) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_addGamesPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring uri) { auto& gamePaths = GetConfig().game_paths; auto gamePath = JNIUtils::toString(env, uri); @@ -182,7 +182,7 @@ Java_info_cemu_cemu_nativeinterface_NativeSettings_addGamesPath(JNIEnv* env, [[m } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_removeGamesPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring uri) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_removeGamesPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring uri) { auto gamePath = JNIUtils::toString(env, uri); auto& gamePaths = GetConfig().game_paths; @@ -190,92 +190,92 @@ Java_info_cemu_cemu_nativeinterface_NativeSettings_removeGamesPath(JNIEnv* env, } extern "C" [[maybe_unused]] JNIEXPORT jobject JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getGamesPaths(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getGamesPaths(JNIEnv* env, [[maybe_unused]] jclass clazz) { return JNIUtils::createJavaStringArrayList(env, GetConfig().game_paths); } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getAsyncShaderCompile([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getAsyncShaderCompile([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().async_compile; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setAsyncShaderCompile([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setAsyncShaderCompile([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().async_compile = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getVsyncMode([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getVsyncMode([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().vsync; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setVsyncMode([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint vsync_mode) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setVsyncMode([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint vsync_mode) { GetConfig().vsync = vsync_mode; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getAccurateBarriers([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getAccurateBarriers([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().vk_accurate_barriers; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setUpscalingFilter([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint upscaling_filter) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setUpscalingFilter([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint upscaling_filter) { GetConfig().upscale_filter = upscaling_filter; } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getUpscalingFilter([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getUpscalingFilter([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().upscale_filter; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setDownscalingFilter([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint downscaling_filter) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setDownscalingFilter([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint downscaling_filter) { GetConfig().downscale_filter = downscaling_filter; } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getDownscalingFilter([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getDownscalingFilter([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().downscale_filter; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setFullscreenScaling([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint fullscreen_scaling) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setFullscreenScaling([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint fullscreen_scaling) { GetConfig().fullscreen_scaling = fullscreen_scaling; } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getFullscreenScaling([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getFullscreenScaling([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().fullscreen_scaling; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setAccurateBarriers([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setAccurateBarriers([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled) { GetConfig().vk_accurate_barriers = enabled; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getAudioDeviceEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean tv) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getAudioDeviceEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean tv) { const auto& device = tv ? GetConfig().tv_device : GetConfig().pad_device; return !device.empty(); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setAudioDeviceEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled, jboolean tv) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setAudioDeviceEnabled([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean enabled, jboolean tv) { auto& device = tv ? GetConfig().tv_device : GetConfig().pad_device; if (enabled) @@ -285,41 +285,41 @@ Java_info_cemu_cemu_nativeinterface_NativeSettings_setAudioDeviceEnabled([[maybe } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getAudioDeviceChannels([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean tv) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getAudioDeviceChannels([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean tv) { const auto& deviceChannels = tv ? GetConfig().tv_channels : GetConfig().pad_channels; return deviceChannels; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setAudioDeviceChannels([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint channels, jboolean tv) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setAudioDeviceChannels([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint channels, jboolean tv) { auto& deviceChannels = tv ? GetConfig().tv_channels : GetConfig().pad_channels; deviceChannels = static_cast(channels); } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getAudioDeviceVolume([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean tv) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getAudioDeviceVolume([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jboolean tv) { const auto& deviceVolume = tv ? GetConfig().tv_volume : GetConfig().pad_volume; return deviceVolume; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setAudioDeviceVolume([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint volume, jboolean tv) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setAudioDeviceVolume([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint volume, jboolean tv) { auto& deviceVolume = tv ? GetConfig().tv_volume : GetConfig().pad_volume; deviceVolume = volume; } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getAudioLatency([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getAudioLatency([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return GetConfig().audio_delay * 12; } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setAudioLatency([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint latency) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setAudioLatency([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint latency) { sint32 audioDelay = latency / 12; GetConfig().audio_delay = audioDelay; @@ -327,19 +327,19 @@ Java_info_cemu_cemu_nativeinterface_NativeSettings_setAudioLatency([[maybe_unuse } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getConsoleLanguage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getConsoleLanguage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return static_cast(GetConfig().console_language.GetValue()); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setConsoleLanguage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint console_language) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setConsoleLanguage([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint console_language) { GetConfig().console_language = static_cast(console_language); } extern "C" [[maybe_unused]] JNIEXPORT jstring JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getCustomDriverPath(JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getCustomDriverPath(JNIEnv* env, [[maybe_unused]] jclass clazz) { std::string customDriverPath = GetConfig().custom_driver_path; if (customDriverPath.empty()) @@ -348,43 +348,43 @@ Java_info_cemu_cemu_nativeinterface_NativeSettings_getCustomDriverPath(JNIEnv* e } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setCustomDriverPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring custom_driver_path) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setCustomDriverPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring custom_driver_path) { GetConfig().custom_driver_path = JNIUtils::toString(env, custom_driver_path); } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getAccountNetworkService([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getAccountNetworkService([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id) { return static_cast(GetConfig().GetAccountNetworkService(persistent_id)); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setAccountNetworkService([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id, jint network_service) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setAccountNetworkService([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id, jint network_service) { GetConfig().SetAccountSelectedService(persistent_id, static_cast(network_service)); } extern "C" [[maybe_unused]] JNIEXPORT jint JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_getAccountPersistentId([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_getAccountPersistentId([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return static_cast(GetConfig().account.m_persistent_id); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_setAccountPersistentId([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_setAccountPersistentId([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint persistent_id) { GetConfig().account.m_persistent_id = persistent_id; } extern "C" [[maybe_unused]] JNIEXPORT jboolean JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_hasCustomNetworkConfiguration([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_hasCustomNetworkConfiguration([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { return NetworkConfig::XMLExists(); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSettings_saveSettings([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSettings_saveSettings([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { GetConfigHandle().Save(); } diff --git a/src/android/app/src/main/cpp/NativeSwkbd.cpp b/src/android/app/src/main/cpp/NativeSwkbd.cpp index c711114a..88c11d4c 100644 --- a/src/android/app/src/main/cpp/NativeSwkbd.cpp +++ b/src/android/app/src/main/cpp/NativeSwkbd.cpp @@ -23,7 +23,7 @@ namespace NativeSwkbd } // namespace NativeSwkbd extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSwkbd_initializeSwkbd([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSwkbd_initializeSwkbd([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { if (NativeSwkbd::s_swkbdCallbacks != nullptr) return; @@ -32,13 +32,13 @@ Java_info_cemu_cemu_nativeinterface_NativeSwkbd_initializeSwkbd([[maybe_unused]] } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSwkbd_setCurrentInputText([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jstring initial_text) +Java_com_izzy2lost_weeu_nativeinterface_NativeSwkbd_setCurrentInputText([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jstring initial_text) { NativeSwkbd::s_currentInputText = JNIUtils::toString(env, initial_text); } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSwkbd_onTextChanged([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jstring j_text) +Java_com_izzy2lost_weeu_nativeinterface_NativeSwkbd_onTextChanged([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jstring j_text) { std::string text = JNIUtils::toString(env, j_text); auto stringDiff = NativeSwkbd::getStringDiffs(text, NativeSwkbd::s_currentInputText); @@ -50,7 +50,7 @@ Java_info_cemu_cemu_nativeinterface_NativeSwkbd_onTextChanged([[maybe_unused]] J } extern "C" [[maybe_unused]] JNIEXPORT void JNICALL -Java_info_cemu_cemu_nativeinterface_NativeSwkbd_onFinishedInputEdit([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) +Java_com_izzy2lost_weeu_nativeinterface_NativeSwkbd_onFinishedInputEdit([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { swkbd::keyInput(swkbd::RETURN_KEYCODE); } \ No newline at end of file