Merge pull request #8902 from JosJuice/android-convert

Android: Add disc image conversion

1 files changed, 47 insertions, 0 deletions

diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp
index 8383f8ed68..b4052c42bf 100644
--- a/Source/Android/jni/AndroidCommon/IDCache.cpp
+++ b/Source/Android/jni/AndroidCommon/IDCache.cpp
@@ -36,6 +36,13 @@ static jclass s_ini_file_section_class;
 static jfieldID s_ini_file_section_pointer;
 static jmethodID s_ini_file_section_constructor;
 
+static jclass s_compress_cb_class;
+static jmethodID s_compress_cb_run;
+
+static jclass s_content_handler_class;
+static jmethodID s_content_handler_open_fd;
+static jmethodID s_content_handler_delete;
+
 namespace IDCache
 {
 JNIEnv* GetEnvForThread()
@@ -161,6 +168,31 @@ jmethodID GetIniFileSectionConstructor()
   return s_ini_file_section_constructor;
 }
 
+jclass GetCompressCallbackClass()
+{
+  return s_compress_cb_class;
+}
+
+jmethodID GetCompressCallbackRun()
+{
+  return s_compress_cb_run;
+}
+
+jclass GetContentHandlerClass()
+{
+  return s_content_handler_class;
+}
+
+jmethodID GetContentHandlerOpenFd()
+{
+  return s_content_handler_open_fd;
+}
+
+jmethodID GetContentHandlerDelete()
+{
+  return s_content_handler_delete;
+}
+
 }  // namespace IDCache
 
 #ifdef __cplusplus
@@ -223,6 +255,19 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
   s_linked_hash_map_put = env->GetMethodID(
       s_linked_hash_map_class, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
 
+  const jclass compress_cb_class =
+      env->FindClass("org/dolphinemu/dolphinemu/utils/CompressCallback");
+  s_compress_cb_class = reinterpret_cast<jclass>(env->NewGlobalRef(compress_cb_class));
+  s_compress_cb_run = env->GetMethodID(s_compress_cb_class, "run", "(Ljava/lang/String;F)Z");
+
+  const jclass content_handler_class =
+      env->FindClass("org/dolphinemu/dolphinemu/utils/ContentHandler");
+  s_content_handler_class = reinterpret_cast<jclass>(env->NewGlobalRef(content_handler_class));
+  s_content_handler_open_fd = env->GetStaticMethodID(s_content_handler_class, "openFd",
+                                                     "(Ljava/lang/String;Ljava/lang/String;)I");
+  s_content_handler_delete =
+      env->GetStaticMethodID(s_content_handler_class, "delete", "(Ljava/lang/String;)Z");
+
   return JNI_VERSION;
 }
 
@@ -239,6 +284,8 @@ void JNI_OnUnload(JavaVM* vm, void* reserved)
   env->DeleteGlobalRef(s_linked_hash_map_class);
   env->DeleteGlobalRef(s_ini_file_class);
   env->DeleteGlobalRef(s_ini_file_section_class);
+  env->DeleteGlobalRef(s_compress_cb_class);
+  env->DeleteGlobalRef(s_content_handler_class);
 }
 
 #ifdef __cplusplus