summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/GCAdapter.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2025-01-02 15:39:41 +0100
committerJosJuice <josjuice@gmail.com>2025-07-27 11:13:44 +0200
commit7508842859bc1c791d1fff2ba514f547a59a631d (patch)
tree2e95429db35f3a901450210f2c6c4c59cd3a3ae7 /Source/Core/InputCommon/GCAdapter.cpp
parent57b145990dec3f942f25c6b8d716051f1f429946 (diff)
Android: Clean up naming in Java_GCAdapter and Java_WiimoteAdapter
This isn't how we name things in Java/Kotlin.
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter.cpp')
-rw-r--r--Source/Core/InputCommon/GCAdapter.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
index 5cfe513935..103af024fd 100644
--- a/Source/Core/InputCommon/GCAdapter.cpp
+++ b/Source/Core/InputCommon/GCAdapter.cpp
@@ -180,14 +180,14 @@ static void ReadThreadFunc()
bool first_read = true;
JNIEnv* const env = IDCache::GetEnvForThread();
- const jfieldID payload_field = env->GetStaticFieldID(s_adapter_class, "controller_payload", "[B");
+ const jfieldID payload_field = env->GetStaticFieldID(s_adapter_class, "controllerPayload", "[B");
jobject payload_object = env->GetStaticObjectField(s_adapter_class, payload_field);
auto* const java_controller_payload = reinterpret_cast<jbyteArray*>(&payload_object);
// Get function pointers
- const jmethodID getfd_func = env->GetStaticMethodID(s_adapter_class, "GetFD", "()I");
- const jmethodID input_func = env->GetStaticMethodID(s_adapter_class, "Input", "()I");
- const jmethodID openadapter_func = env->GetStaticMethodID(s_adapter_class, "OpenAdapter", "()Z");
+ const jmethodID getfd_func = env->GetStaticMethodID(s_adapter_class, "getFd", "()I");
+ const jmethodID input_func = env->GetStaticMethodID(s_adapter_class, "input", "()I");
+ const jmethodID openadapter_func = env->GetStaticMethodID(s_adapter_class, "openAdapter", "()Z");
const bool connected = env->CallStaticBooleanMethod(s_adapter_class, openadapter_func);
@@ -279,7 +279,7 @@ static void WriteThreadFunc()
int size = 0;
#elif GCADAPTER_USE_ANDROID_IMPLEMENTATION
JNIEnv* const env = IDCache::GetEnvForThread();
- const jmethodID output_func = env->GetStaticMethodID(s_adapter_class, "Output", "([B)I");
+ const jmethodID output_func = env->GetStaticMethodID(s_adapter_class, "output", "([B)I");
#endif
while (s_write_adapter_thread_running.IsSet())
@@ -394,7 +394,7 @@ static void ScanThreadFunc()
JNIEnv* const env = IDCache::GetEnvForThread();
const jmethodID queryadapter_func =
- env->GetStaticMethodID(s_adapter_class, "QueryAdapter", "()Z");
+ env->GetStaticMethodID(s_adapter_class, "queryAdapter", "()Z");
while (s_adapter_detect_thread_running.IsSet())
{
@@ -456,7 +456,7 @@ void Init()
#elif GCADAPTER_USE_ANDROID_IMPLEMENTATION
JNIEnv* const env = IDCache::GetEnvForThread();
- const jclass adapter_class = env->FindClass("org/dolphinemu/dolphinemu/utils/Java_GCAdapter");
+ const jclass adapter_class = env->FindClass("org/dolphinemu/dolphinemu/utils/GCAdapter");
s_adapter_class = reinterpret_cast<jclass>(env->NewGlobalRef(adapter_class));
#endif