ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

android: get rid of deprecated boot and disk swap funcs

This commit is contained in:
Flyinghead 2020-01-31 11:36:40 +01:00
parent 79fef77099
commit 276a77ec26
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
shell/android-studio/reicast/src/main/jni/src/Android.cpp
View File

@ -249,20 +249,6 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setExternalStorageDir
gui_refresh_files();
}
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_bootdisk(JNIEnv *env,jobject obj, jstring disk) {
if (disk != NULL) {
settings.imgread.LoadDefaultImage = true;
const char *P = env->GetStringUTFChars(disk, 0);
if (!P) settings.imgread.DefaultImage[0] = '\0';
else {
INFO_LOG(BOOT, "Boot Disk URI: '%s'", P);
strncpy(settings.imgread.DefaultImage,(strlen(P)>=7)&&!memcmp(
P,"file://",7)? P+7:P,sizeof(settings.imgread.DefaultImage));
settings.imgread.DefaultImage[sizeof(settings.imgread.DefaultImage) - 1] = '\0';
}
}
}
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setGameUri(JNIEnv *env,jobject obj,jstring fileName)
{
if (fileName != NULL)
@ -278,27 +264,6 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setGameUri(JNIEnv *en
}
}
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_diskSwap(JNIEnv *env,jobject obj,jstring disk)
{
if (settings.imgread.LoadDefaultImage) {
strncpy(settings.imgread.DefaultImage, gamedisk, sizeof(settings.imgread.DefaultImage));
settings.imgread.DefaultImage[sizeof(settings.imgread.DefaultImage) - 1] = '\0';
DiscSwap();
} else if (disk != NULL) {
settings.imgread.LoadDefaultImage = true;
const char *P = env->GetStringUTFChars(disk, 0);
if (!P) settings.imgread.DefaultImage[0] = '\0';
else {
INFO_LOG(GDROM, "Swap Disk URI: '%s'", P);
strncpy(settings.imgread.DefaultImage,(strlen(P)>=7)&&!memcmp(
P,"file://",7)? P+7:P,sizeof(settings.imgread.DefaultImage));
settings.imgread.DefaultImage[sizeof(settings.imgread.DefaultImage) - 1] = '\0';
env->ReleaseStringUTFChars(disk, P);
}
DiscSwap();
}
}
//stuff for microphone
jobject sipemu;
jmethodID getmicdata;