diff options
author | Zephyron <zephyron@citron-emu.org> | 2024-12-31 17:07:49 +1000 |
---|---|---|
committer | Zephyron <zephyron@citron-emu.org> | 2024-12-31 17:07:49 +1000 |
commit | b3facaa6bb30cdc39f2b7d632fef1e3bfeee7785 (patch) | |
tree | 77d03cd30542cd5e1addc61f240b8120a5909e90 /src/common/android | |
parent | 6778aa8ec8e5fa0d246ac4b9ec00c10213c30ce5 (diff) |
chore: update project references and add Citron copyright
- Replaced all references to the old project name with Citron.
- Added Citron copyright information alongside existing notices in all files.
Diffstat (limited to 'src/common/android')
-rw-r--r-- | src/common/android/android_common.cpp | 2 | ||||
-rw-r--r-- | src/common/android/android_common.h | 2 | ||||
-rw-r--r-- | src/common/android/applets/software_keyboard.cpp | 12 | ||||
-rw-r--r-- | src/common/android/applets/software_keyboard.h | 2 | ||||
-rw-r--r-- | src/common/android/id_cache.cpp | 102 | ||||
-rw-r--r-- | src/common/android/id_cache.h | 18 |
6 files changed, 69 insertions, 69 deletions
diff --git a/src/common/android/android_common.cpp b/src/common/android/android_common.cpp index e79005658..23c5f6b6b 100644 --- a/src/common/android/android_common.cpp +++ b/src/common/android/android_common.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "android_common.h" diff --git a/src/common/android/android_common.h b/src/common/android/android_common.h index d0ccb4ec2..e057d1449 100644 --- a/src/common/android/android_common.h +++ b/src/common/android/android_common.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/common/android/applets/software_keyboard.cpp b/src/common/android/applets/software_keyboard.cpp index 477e62b16..68d6eb2eb 100644 --- a/src/common/android/applets/software_keyboard.cpp +++ b/src/common/android/applets/software_keyboard.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <map> @@ -253,19 +253,19 @@ void AndroidKeyboard::SubmitNormalText(const ResultData& data) const { void InitJNI(JNIEnv* env) { s_software_keyboard_class = reinterpret_cast<jclass>( - env->NewGlobalRef(env->FindClass("org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard"))); + env->NewGlobalRef(env->FindClass("org/citron/citron_emu/applets/keyboard/SoftwareKeyboard"))); s_keyboard_config_class = reinterpret_cast<jclass>(env->NewGlobalRef( - env->FindClass("org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig"))); + env->FindClass("org/citron/citron_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig"))); s_keyboard_data_class = reinterpret_cast<jclass>(env->NewGlobalRef( - env->FindClass("org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardData"))); + env->FindClass("org/citron/citron_emu/applets/keyboard/SoftwareKeyboard$KeyboardData"))); s_swkbd_execute_normal = env->GetStaticMethodID( s_software_keyboard_class, "executeNormal", - "(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Lorg/yuzu/yuzu_emu/" + "(Lorg/citron/citron_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Lorg/citron/citron_emu/" "applets/keyboard/SoftwareKeyboard$KeyboardData;"); s_swkbd_execute_inline = env->GetStaticMethodID( s_software_keyboard_class, "executeInline", - "(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V"); + "(Lorg/citron/citron_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V"); } void CleanupJNI(JNIEnv* env) { diff --git a/src/common/android/applets/software_keyboard.h b/src/common/android/applets/software_keyboard.h index 9fd09d27c..a2067753f 100644 --- a/src/common/android/applets/software_keyboard.h +++ b/src/common/android/applets/software_keyboard.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/common/android/id_cache.cpp b/src/common/android/id_cache.cpp index 1145cbdf2..73c0d7cde 100644 --- a/src/common/android/id_cache.cpp +++ b/src/common/android/id_cache.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <jni.h> @@ -80,14 +80,14 @@ static jfieldID s_player_input_button_color_right_field; static jfieldID s_player_input_profile_name_field; static jfieldID s_player_input_use_system_vibrator_field; -static jclass s_yuzu_input_device_interface; -static jmethodID s_yuzu_input_device_get_name; -static jmethodID s_yuzu_input_device_get_guid; -static jmethodID s_yuzu_input_device_get_port; -static jmethodID s_yuzu_input_device_get_supports_vibration; -static jmethodID s_yuzu_input_device_vibrate; -static jmethodID s_yuzu_input_device_get_axes; -static jmethodID s_yuzu_input_device_has_keys; +static jclass s_citron_input_device_interface; +static jmethodID s_citron_input_device_get_name; +static jmethodID s_citron_input_device_get_guid; +static jmethodID s_citron_input_device_get_port; +static jmethodID s_citron_input_device_get_supports_vibration; +static jmethodID s_citron_input_device_vibrate; +static jmethodID s_citron_input_device_get_axes; +static jmethodID s_citron_input_device_has_keys; static constexpr jint JNI_VERSION = JNI_VERSION_1_6; @@ -356,36 +356,36 @@ jfieldID GetPlayerInputUseSystemVibratorField() { return s_player_input_use_system_vibrator_field; } -jclass GetYuzuInputDeviceInterface() { - return s_yuzu_input_device_interface; +jclass GetCitronInputDeviceInterface() { + return s_citron_input_device_interface; } -jmethodID GetYuzuDeviceGetName() { - return s_yuzu_input_device_get_name; +jmethodID GetCitronDeviceGetName() { + return s_citron_input_device_get_name; } -jmethodID GetYuzuDeviceGetGUID() { - return s_yuzu_input_device_get_guid; +jmethodID GetCitronDeviceGetGUID() { + return s_citron_input_device_get_guid; } -jmethodID GetYuzuDeviceGetPort() { - return s_yuzu_input_device_get_port; +jmethodID GetCitronDeviceGetPort() { + return s_citron_input_device_get_port; } -jmethodID GetYuzuDeviceGetSupportsVibration() { - return s_yuzu_input_device_get_supports_vibration; +jmethodID GetCitronDeviceGetSupportsVibration() { + return s_citron_input_device_get_supports_vibration; } -jmethodID GetYuzuDeviceVibrate() { - return s_yuzu_input_device_vibrate; +jmethodID GetCitronDeviceVibrate() { + return s_citron_input_device_vibrate; } -jmethodID GetYuzuDeviceGetAxes() { - return s_yuzu_input_device_get_axes; +jmethodID GetCitronDeviceGetAxes() { + return s_citron_input_device_get_axes; } -jmethodID GetYuzuDeviceHasKeys() { - return s_yuzu_input_device_has_keys; +jmethodID GetCitronDeviceHasKeys() { + return s_citron_input_device_has_keys; } #ifdef __cplusplus @@ -400,14 +400,14 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { return JNI_ERR; // Initialize Java classes - const jclass native_library_class = env->FindClass("org/yuzu/yuzu_emu/NativeLibrary"); + const jclass native_library_class = env->FindClass("org/citron/citron_emu/NativeLibrary"); s_native_library_class = reinterpret_cast<jclass>(env->NewGlobalRef(native_library_class)); s_disk_cache_progress_class = reinterpret_cast<jclass>(env->NewGlobalRef( - env->FindClass("org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress"))); + env->FindClass("org/citron/citron_emu/disk_shader_cache/DiskShaderCacheProgress"))); s_load_callback_stage_class = reinterpret_cast<jclass>(env->NewGlobalRef(env->FindClass( - "org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage"))); + "org/citron/citron_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage"))); - const jclass game_dir_class = env->FindClass("org/yuzu/yuzu_emu/model/GameDir"); + const jclass game_dir_class = env->FindClass("org/citron/citron_emu/model/GameDir"); s_game_dir_class = reinterpret_cast<jclass>(env->NewGlobalRef(game_dir_class)); s_game_dir_constructor = env->GetMethodID(game_dir_class, "<init>", "(Ljava/lang/String;Z)V"); env->DeleteLocalRef(game_dir_class); @@ -424,7 +424,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { s_on_program_changed = env->GetStaticMethodID(s_native_library_class, "onProgramChanged", "(I)V"); - const jclass game_class = env->FindClass("org/yuzu/yuzu_emu/model/Game"); + const jclass game_class = env->FindClass("org/citron/citron_emu/model/Game"); s_game_class = reinterpret_cast<jclass>(env->NewGlobalRef(game_class)); s_game_constructor = env->GetMethodID(game_class, "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/" @@ -450,7 +450,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->DeleteLocalRef(pair_class); const jclass overlay_control_data_class = - env->FindClass("org/yuzu/yuzu_emu/overlay/model/OverlayControlData"); + env->FindClass("org/citron/citron_emu/overlay/model/OverlayControlData"); s_overlay_control_data_class = reinterpret_cast<jclass>(env->NewGlobalRef(overlay_control_data_class)); s_overlay_control_data_constructor = @@ -468,7 +468,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->GetFieldID(overlay_control_data_class, "foldablePosition", "Lkotlin/Pair;"); env->DeleteLocalRef(overlay_control_data_class); - const jclass patch_class = env->FindClass("org/yuzu/yuzu_emu/model/Patch"); + const jclass patch_class = env->FindClass("org/citron/citron_emu/model/Patch"); s_patch_class = reinterpret_cast<jclass>(env->NewGlobalRef(patch_class)); s_patch_constructor = env->GetMethodID( patch_class, "<init>", @@ -500,7 +500,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->DeleteLocalRef(boolean_class); const jclass player_input_class = - env->FindClass("org/yuzu/yuzu_emu/features/input/model/PlayerInput"); + env->FindClass("org/citron/citron_emu/features/input/model/PlayerInput"); s_player_input_class = reinterpret_cast<jclass>(env->NewGlobalRef(player_input_class)); s_player_input_constructor = env->GetMethodID( player_input_class, "<init>", @@ -530,23 +530,23 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) { env->GetFieldID(player_input_class, "useSystemVibrator", "Z"); env->DeleteLocalRef(player_input_class); - const jclass yuzu_input_device_interface = - env->FindClass("org/yuzu/yuzu_emu/features/input/YuzuInputDevice"); - s_yuzu_input_device_interface = - reinterpret_cast<jclass>(env->NewGlobalRef(yuzu_input_device_interface)); - s_yuzu_input_device_get_name = - env->GetMethodID(yuzu_input_device_interface, "getName", "()Ljava/lang/String;"); - s_yuzu_input_device_get_guid = - env->GetMethodID(yuzu_input_device_interface, "getGUID", "()Ljava/lang/String;"); - s_yuzu_input_device_get_port = env->GetMethodID(yuzu_input_device_interface, "getPort", "()I"); - s_yuzu_input_device_get_supports_vibration = - env->GetMethodID(yuzu_input_device_interface, "getSupportsVibration", "()Z"); - s_yuzu_input_device_vibrate = env->GetMethodID(yuzu_input_device_interface, "vibrate", "(F)V"); - s_yuzu_input_device_get_axes = - env->GetMethodID(yuzu_input_device_interface, "getAxes", "()[Ljava/lang/Integer;"); - s_yuzu_input_device_has_keys = - env->GetMethodID(yuzu_input_device_interface, "hasKeys", "([I)[Z"); - env->DeleteLocalRef(yuzu_input_device_interface); + const jclass citron_input_device_interface = + env->FindClass("org/citron/citron_emu/features/input/CitronInputDevice"); + s_citron_input_device_interface = + reinterpret_cast<jclass>(env->NewGlobalRef(citron_input_device_interface)); + s_citron_input_device_get_name = + env->GetMethodID(citron_input_device_interface, "getName", "()Ljava/lang/String;"); + s_citron_input_device_get_guid = + env->GetMethodID(citron_input_device_interface, "getGUID", "()Ljava/lang/String;"); + s_citron_input_device_get_port = env->GetMethodID(citron_input_device_interface, "getPort", "()I"); + s_citron_input_device_get_supports_vibration = + env->GetMethodID(citron_input_device_interface, "getSupportsVibration", "()Z"); + s_citron_input_device_vibrate = env->GetMethodID(citron_input_device_interface, "vibrate", "(F)V"); + s_citron_input_device_get_axes = + env->GetMethodID(citron_input_device_interface, "getAxes", "()[Ljava/lang/Integer;"); + s_citron_input_device_has_keys = + env->GetMethodID(citron_input_device_interface, "hasKeys", "([I)[Z"); + env->DeleteLocalRef(citron_input_device_interface); // Initialize Android Storage Common::FS::Android::RegisterCallbacks(env, s_native_library_class); @@ -578,7 +578,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) { env->DeleteGlobalRef(s_integer_class); env->DeleteGlobalRef(s_boolean_class); env->DeleteGlobalRef(s_player_input_class); - env->DeleteGlobalRef(s_yuzu_input_device_interface); + env->DeleteGlobalRef(s_citron_input_device_interface); // UnInitialize applets SoftwareKeyboard::CleanupJNI(env); diff --git a/src/common/android/id_cache.h b/src/common/android/id_cache.h index cd2844dcc..b3cd56727 100644 --- a/src/common/android/id_cache.h +++ b/src/common/android/id_cache.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -100,13 +100,13 @@ jfieldID GetPlayerInputButtonColorRightField(); jfieldID GetPlayerInputProfileNameField(); jfieldID GetPlayerInputUseSystemVibratorField(); -jclass GetYuzuInputDeviceInterface(); -jmethodID GetYuzuDeviceGetName(); -jmethodID GetYuzuDeviceGetGUID(); -jmethodID GetYuzuDeviceGetPort(); -jmethodID GetYuzuDeviceGetSupportsVibration(); -jmethodID GetYuzuDeviceVibrate(); -jmethodID GetYuzuDeviceGetAxes(); -jmethodID GetYuzuDeviceHasKeys(); +jclass GetCitronInputDeviceInterface(); +jmethodID GetCitronDeviceGetName(); +jmethodID GetCitronDeviceGetGUID(); +jmethodID GetCitronDeviceGetPort(); +jmethodID GetCitronDeviceGetSupportsVibration(); +jmethodID GetCitronDeviceVibrate(); +jmethodID GetCitronDeviceGetAxes(); +jmethodID GetCitronDeviceHasKeys(); } // namespace Common::Android |