diff options
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/java_glue.cpp | 10 | ||||
| -rw-r--r-- | platform/android/os_android.cpp | 4 | ||||
| -rw-r--r-- | platform/android/os_android.h | 2 | ||||
| -rw-r--r-- | platform/android/thread_jandroid.cpp | 6 | ||||
| -rw-r--r-- | platform/android/thread_jandroid.h | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 0508989d2f..683e1cfb22 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -895,7 +895,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *en JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv *env, jobject obj, jint width, jint height, jboolean reload) { - __android_log_print(ANDROID_LOG_INFO, "godot", "^_^_^_^_^ resize %lld, %i, %i\n", Thread::get_caller_ID(), width, height); + __android_log_print(ANDROID_LOG_INFO, "godot", "^_^_^_^_^ resize %lld, %i, %i\n", Thread::get_caller_id(), width, height); if (os_android) os_android->set_display_size(Size2(width, height)); @@ -909,7 +909,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv *env, j JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv *env, jobject obj, bool p_32_bits) { - __android_log_print(ANDROID_LOG_INFO, "godot", "^_^_^_^_^ newcontext %lld\n", Thread::get_caller_ID()); + __android_log_print(ANDROID_LOG_INFO, "godot", "^_^_^_^_^ newcontext %lld\n", Thread::get_caller_id()); if (os_android) { os_android->set_context_is_16_bits(!p_32_bits); @@ -995,7 +995,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, job ThreadAndroid::setup_thread(); - //__android_log_print(ANDROID_LOG_INFO,"godot","**STEP EVENT! - %p-%i\n",env,Thread::get_caller_ID()); + //__android_log_print(ANDROID_LOG_INFO,"godot","**STEP EVENT! - %p-%i\n",env,Thread::get_caller_id()); suspend_mutex->lock(); input_mutex->lock(); @@ -1069,7 +1069,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, job jclass cls = env->FindClass("org/godotengine/godot/Godot"); jmethodID _finish = env->GetMethodID(cls, "forceQuit", "()V"); env->CallVoidMethod(_godot_instance, _finish); - __android_log_print(ANDROID_LOG_INFO, "godot", "**FINISH REQUEST!!! - %p-%i\n", env, Thread::get_caller_ID()); + __android_log_print(ANDROID_LOG_INFO, "godot", "**FINISH REQUEST!!! - %p-%i\n", env, Thread::get_caller_id()); } suspend_mutex->unlock(); @@ -1077,7 +1077,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, job JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch(JNIEnv *env, jobject obj, jint ev, jint pointer, jint count, jintArray positions) { - //__android_log_print(ANDROID_LOG_INFO,"godot","**TOUCH EVENT! - %p-%i\n",env,Thread::get_caller_ID()); + //__android_log_print(ANDROID_LOG_INFO,"godot","**TOUCH EVENT! - %p-%i\n",env,Thread::get_caller_id()); Vector<OS_Android::TouchPos> points; for (int i = 0; i < count; i++) { diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index ad46ceb43f..e3f982ff94 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -686,11 +686,11 @@ void OS_Android::set_screen_orientation(ScreenOrientation p_orientation) { set_screen_orientation_func(p_orientation); } -String OS_Android::get_unique_ID() const { +String OS_Android::get_unique_id() const { if (get_unique_id_func) return get_unique_id_func(); - return OS::get_unique_ID(); + return OS::get_unique_id(); } Error OS_Android::native_video_play(String p_path, float p_volume) { diff --git a/platform/android/os_android.h b/platform/android/os_android.h index 393bc68d8a..54d7e562e0 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -222,7 +222,7 @@ public: virtual String get_model_name() const; virtual int get_screen_dpi(int p_screen = 0) const; - virtual String get_unique_ID() const; + virtual String get_unique_id() const; virtual String get_system_dir(SystemDir p_dir) const; diff --git a/platform/android/thread_jandroid.cpp b/platform/android/thread_jandroid.cpp index 401f3cd73b..924ae3fe43 100644 --- a/platform/android/thread_jandroid.cpp +++ b/platform/android/thread_jandroid.cpp @@ -32,7 +32,7 @@ #include "os/memory.h" #include "script_language.h" -Thread::ID ThreadAndroid::get_ID() const { +Thread::ID ThreadAndroid::get_id() const { return id; } @@ -66,7 +66,7 @@ Thread *ThreadAndroid::create_func_jandroid(ThreadCreateCallback p_callback, voi return tr; } -Thread::ID ThreadAndroid::get_thread_ID_func_jandroid() { +Thread::ID ThreadAndroid::get_thread_id_func_jandroid() { return (ID)pthread_self(); } @@ -107,7 +107,7 @@ void ThreadAndroid::make_default(JavaVM *p_java_vm) { java_vm = p_java_vm; create_func = create_func_jandroid; - get_thread_ID_func = get_thread_ID_func_jandroid; + get_thread_id_func = get_thread_id_func_jandroid; wait_to_finish_func = wait_to_finish_func_jandroid; pthread_key_create(&jvm_key, _thread_destroyed); setup_thread(); diff --git a/platform/android/thread_jandroid.h b/platform/android/thread_jandroid.h index 6174066968..5267329744 100644 --- a/platform/android/thread_jandroid.h +++ b/platform/android/thread_jandroid.h @@ -52,7 +52,7 @@ class ThreadAndroid : public Thread { static void *thread_callback(void *userdata); static Thread *create_func_jandroid(ThreadCreateCallback p_callback, void *, const Settings &); - static ID get_thread_ID_func_jandroid(); + static ID get_thread_id_func_jandroid(); static void wait_to_finish_func_jandroid(Thread *p_thread); static void _thread_destroyed(void *value); @@ -62,7 +62,7 @@ class ThreadAndroid : public Thread { static JavaVM *java_vm; public: - virtual ID get_ID() const; + virtual ID get_id() const; static void make_default(JavaVM *p_java_vm); static void setup_thread(); |