mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 03:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) use RARCH_LOG in bifrost.c

Browse Source
This commit is contained in:
twinaphex 2012-10-03 16:23:50 +02:00
parent c49aa886a1
commit 0d0fd03e09
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/.classpath
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <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.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <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"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

1
android/.project
View File

@ -42,7 +42,6 @@
<nature>com.android.ide.eclipse.adt.AndroidNature</nature> <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.cdt.core.cnature</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.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures> </natures>

7
android/bifrost.c
View File

@ -31,18 +31,19 @@
JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt) 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; return JNI_VERSION_1_2;
} }
JNIEXPORT void JNICALL JNI_OnUnLoad( JavaVM *vm, void *pvt) 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 JNIEXPORT void JNICALL Java_com_retroarch_rruntime_load_1game
(JNIEnv *env, jclass class, jstring j_path, jint j_extract_zip_mode) (JNIEnv *env, jclass class, jstring j_path, jint j_extract_zip_mode)
{ {
RARCH_LOG("* rruntime_load_game.\n" );
jboolean is_copy = false; jboolean is_copy = false;
const char * game_path = (*env)->GetStringUTFChars(env, j_path, &is_copy); 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 JNIEXPORT void JNICALL Java_com_retroarch_rruntime_startup
(JNIEnv *env, jclass class, jstring j_config_path) (JNIEnv *env, jclass class, jstring j_config_path)
{ {
RARCH_LOG("* rruntime_startup.\n" );
bool retval = false; bool retval = false;
jboolean is_copy = false; jboolean is_copy = false;
const char * config_path = (*env)->GetStringUTFChars(env, j_config_path, &is_copy); 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 JNIEXPORT void JNICALL Java_com_retroarch_rruntime_settings_1set_1defaults
(JNIEnv *env, jclass class) (JNIEnv *env, jclass class)
{ {
RARCH_LOG("* rruntime_settings_set_defaults.\n" );
rarch_settings_set_default(); rarch_settings_set_default();
} }

2
android/src/com/retroarch/fileio/FileChooser.java
View File

@ -230,7 +230,9 @@ public class FileChooser extends Activity
intent.putExtra(FileChooser.PAYLOAD_FILENAME, o.getPath()); intent.putExtra(FileChooser.PAYLOAD_FILENAME, o.getPath());
setResult(RESULT_OK, intent); setResult(RESULT_OK, intent);
rruntime.settings_set_defaults();
rruntime.load_game(o.getName(), 0); rruntime.load_game(o.getName(), 0);
rruntime.startup(null);
finish(); finish();
} }