From 6c05196e4f850d9dc73ef2fceb3f5e54e8ab65b3 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sun, 16 Sep 2012 22:11:15 +0200
Subject: [PATCH] (Android) More exposed functions in Bifrost

---
 android/bifrost.c      | 45 ++++++++++++++++++++++++++++++++++++++++++
 android/jni/Android.mk |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/android/bifrost.c b/android/bifrost.c
index 17dbdc0ea9..4b8ba57195 100644
--- a/android/bifrost.c
+++ b/android/bifrost.c
@@ -22,7 +22,9 @@
 #include <jni.h>
 #include "../boolean.h"
 
+#include "../console/rarch_console_main_wrap.h"
 #include "../console/rarch_console_rom_ext.h"
+#include "../console/rarch_console_settings.h"
 #include "../general.h"
 
 JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_load_game
@@ -41,3 +43,46 @@ JNIEXPORT jboolean JNICALL Java_com_retroarch_RRuntime_run_frame
 {
    return rarch_main_iterate();
 }
+
+JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_startup
+   (JNIEnv *env, jclass class, jstring j_config_path)
+{
+   bool retval = false;
+   jboolean is_copy = false;
+   const char * config_path = (*env)->GetStringUTFChars(env, j_config_path, &is_copy);
+   
+   retval = rarch_startup(config_path);
+
+   (*env)->ReleaseStringUTFChars(env, j_config_path, config_path);
+}
+
+JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_deinit
+   (JNIEnv *env, jclass class)
+{
+   rarch_main_deinit();
+}
+
+JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_load_state
+   (JNIEnv *env, jclass class)
+{
+   rarch_load_state();
+}
+
+JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_save_state
+   (JNIEnv *env, jclass class)
+{
+   rarch_save_state();
+}
+
+JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_settings_change
+   (JNIEnv *env, jclass class, jint j_setting)
+{
+   unsigned setting = j_setting;
+   rarch_settings_change(setting);
+}
+
+JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_settings_set_defaults
+   (JNIEnv *env, jclass class)
+{
+   rarch_settings_set_default();
+}
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index b18c1d73ea..5dc2bac9da 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := retroarch
 LOCAL_SRC_FILES    = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c ../bifrost.c
 
-LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99
+LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99
 
 LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -lGLESv2 -llog