From 0d0fd03e09cc9c0f82c8c62b4c86543be9baae2c Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Wed, 3 Oct 2012 16:23:50 +0200
Subject: [PATCH] (Android) use RARCH_LOG in bifrost.c

---
 android/.classpath                                | 4 ++--
 android/.project                                  | 1 -
 android/bifrost.c                                 | 7 +++++--
 android/src/com/retroarch/fileio/FileChooser.java | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/android/.classpath b/android/.classpath
index a4763d1eec..3f9691c5dd 100644
--- a/android/.classpath
+++ b/android/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/android/.project b/android/.project
index f67bf8570b..998a9b8e16 100644
--- a/android/.project
+++ b/android/.project
@@ -42,7 +42,6 @@
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
diff --git a/android/bifrost.c b/android/bifrost.c
index 5effa16725..5f8587b161 100644
--- a/android/bifrost.c
+++ b/android/bifrost.c
@@ -31,18 +31,19 @@
 
 JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt)
 {
-   fprintf(stdout, "* JNI_OnLoad called\n" );
+   RARCH_LOG("* JNI_OnLoad.\n" );
    return JNI_VERSION_1_2;
 }
 
 JNIEXPORT void JNICALL JNI_OnUnLoad( JavaVM *vm, void *pvt)
 {
-   fprintf(stdout, "* JNI_OnUnLoad called\n" );
+   RARCH_LOG("* JNI_OnUnLoad.\n" );
 }
 
 JNIEXPORT void JNICALL Java_com_retroarch_rruntime_load_1game
    (JNIEnv *env, jclass class, jstring j_path, jint j_extract_zip_mode)
 {
+   RARCH_LOG("* rruntime_load_game.\n" );
    jboolean is_copy = false;
    const char * game_path = (*env)->GetStringUTFChars(env, j_path, &is_copy);
 
@@ -60,6 +61,7 @@ JNIEXPORT jboolean JNICALL Java_com_retroarch_rruntime_run_1frame
 JNIEXPORT void JNICALL Java_com_retroarch_rruntime_startup
    (JNIEnv *env, jclass class, jstring j_config_path)
 {
+   RARCH_LOG("* rruntime_startup.\n" );
    bool retval = false;
    jboolean is_copy = false;
    const char * config_path = (*env)->GetStringUTFChars(env, j_config_path, &is_copy);
@@ -97,5 +99,6 @@ JNIEXPORT void JNICALL Java_com_retroarch_rruntime_settings_1change
 JNIEXPORT void JNICALL Java_com_retroarch_rruntime_settings_1set_1defaults
    (JNIEnv *env, jclass class)
 {
+   RARCH_LOG("* rruntime_settings_set_defaults.\n" );
    rarch_settings_set_default();
 }
diff --git a/android/src/com/retroarch/fileio/FileChooser.java b/android/src/com/retroarch/fileio/FileChooser.java
index 91dff1246b..50eabdb333 100644
--- a/android/src/com/retroarch/fileio/FileChooser.java
+++ b/android/src/com/retroarch/fileio/FileChooser.java
@@ -230,7 +230,9 @@ public class FileChooser extends Activity
          intent.putExtra(FileChooser.PAYLOAD_FILENAME, o.getPath());
          setResult(RESULT_OK, intent);
          
+         rruntime.settings_set_defaults();
          rruntime.load_game(o.getName(), 0);
+         rruntime.startup(null);
          
          finish();         
      }