Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2026-04-21 17:16:38 +00:00
Code Issues Projects Releases Wiki Activity

REFACTOR : glcpuanim now manages all generic alert messages

Browse Source
This commit is contained in:
Aaron Culliney
2015-04-18 14:53:01 -07:00
parent 592c80344f
commit c2bd14f9b5
10 changed files with 300 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android/jni/jnihooks.c
+10 -7
View File
@@ -238,8 +238,8 @@ void Java_org_deadc0de_apple2ix_Apple2Activity_nativeIncreaseCPUSpeed(JNIEnv *en
LOG("native set emulation percentage to %f", cpu_scale_factor);
if (video_backend->video_animation_show_cpuspeed) {
video_backend->video_animation_show_cpuspeed();
if (video_backend->animation_showCPUSpeed) {
video_backend->animation_showCPUSpeed();
}
#warning HACK TODO FIXME ... refactor timing stuff
@@ -271,8 +271,8 @@ void Java_org_deadc0de_apple2ix_Apple2Activity_nativeDecreaseCPUSpeed(JNIEnv *en
LOG("native set emulation percentage to %f", cpu_scale_factor);
if (video_backend->video_animation_show_cpuspeed) {
video_backend->video_animation_show_cpuspeed();
if (video_backend->animation_showCPUSpeed) {
video_backend->animation_showCPUSpeed();
}
#warning HACK TODO FIXME ... refactor timing stuff
@@ -299,18 +299,21 @@ void Java_org_deadc0de_apple2ix_Apple2Activity_nativeChooseDisk(JNIEnv *env, job
const char *path = (*env)->GetStringUTFChars(env, jPath, 0);
int drive = driveA ? 0 : 1;
int ro = readOnly ? 1 : 0;
LOG("nativeChooseDisk(%s, %s, %s)", path, driveA ? "drive A" : "drive B", readOnly ? "read only" : "read/write");
if (c_new_diskette_6(drive, path, ro)) {
char *gzPath = NULL;
asprintf(&gzPath, "%s.gz", path);
if (c_new_diskette_6(drive, gzPath, ro)) {
// TODO FIXME : show error message disk was unreadable ...
char *diskImageUnreadable = "Disk Image Unreadable";
unsigned int cols = strlen(diskImageUnreadable);
video_backend->animation_showMessage(diskImageUnreadable, cols, 1);
} else {
// TODO FIXME : show an OpenGL message that the disk was chosen ...
video_backend->animation_showDiskChosen(drive);
}
FREE(gzPath);
} else {
// TODO FIXME : show an OpenGL message that the disk was chosen ...
video_backend->animation_showDiskChosen(drive);
}
(*env)->ReleaseStringUTFChars(env, jPath, path);
}
Android/jni/sources.mk
+1 -1
View File
@@ -13,7 +13,7 @@ APPLE2_VIDEO_SRC = \
$(APPLE2_SRC_PATH)/video/glvideo.c \
$(APPLE2_SRC_PATH)/video/glnode.c \
$(APPLE2_SRC_PATH)/video/glhudmodel.c \
$(APPLE2_SRC_PATH)/video/glcpuanim.c \
$(APPLE2_SRC_PATH)/video/glalert.c \
$(APPLE2_SRC_PATH)/video/gltouchjoy.c \
$(APPLE2_SRC_PATH)/video_util/matrixUtil.c \
$(APPLE2_SRC_PATH)/video_util/modelUtil.c \