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

Refactor to not use video_backend in so many places

Browse Source
This commit is contained in:
Aaron Culliney
2016-02-06 21:23:40 -08:00
parent 5fec80a33a
commit 261ae2efae
21 changed files with 366 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android/jni/jnihooks.c
+3 -3
View File
@@ -356,13 +356,13 @@ void Java_org_deadc0de_apple2ix_Apple2Activity_nativeChooseDisk(JNIEnv *env, jcl
if (disk6_insert(drive, gzPath, ro)) {
char *diskImageUnreadable = "Disk Image Unreadable";
unsigned int cols = strlen(diskImageUnreadable);
video_backend->animation_showMessage(diskImageUnreadable, cols, 1);
video_animations->animation_showMessage(diskImageUnreadable, cols, 1);
} else {
video_backend->animation_showDiskChosen(drive);
video_animations->animation_showDiskChosen(drive);
}
ASPRINTF_FREE(gzPath);
} else {
video_backend->animation_showDiskChosen(drive);
video_animations->animation_showDiskChosen(drive);
}
(*env)->ReleaseStringUTFChars(env, jPath, path);
}
Android/jni/jniprefs.c
+7 -7
View File
@@ -83,20 +83,20 @@ void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetCurrentTouchDevice(JN
keydriver_setTouchKeyboardOwnsScreen(false);
joydriver_setTouchJoystickOwnsScreen(true);
joydriver_setTouchVariant(EMULATED_JOYSTICK);
video_backend->animation_showTouchJoystick();
video_animations->animation_showTouchJoystick();
break;
case TOUCH_DEVICE_JOYSTICK_KEYPAD:
keydriver_setTouchKeyboardOwnsScreen(false);
joydriver_setTouchJoystickOwnsScreen(true);
joydriver_setTouchVariant(EMULATED_KEYPAD);
video_backend->animation_showTouchJoystick();
video_animations->animation_showTouchJoystick();
break;
case TOUCH_DEVICE_KEYBOARD:
keydriver_setTouchKeyboardOwnsScreen(true);
joydriver_setTouchJoystickOwnsScreen(false);
video_backend->animation_showTouchKeyboard();
video_animations->animation_showTouchKeyboard();
break;
case TOUCH_DEVICE_NONE:
@@ -137,8 +137,8 @@ void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetTouchMenuEnabled(JNIE
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetShowDiskOperationAnimation(JNIEnv *env, jclass cls, jboolean enabled) {
LOG("enabled : %d", enabled);
if (video_backend && video_backend->animation_setEnableShowTrackSector) {
video_backend->animation_setEnableShowTrackSector(enabled);
if (video_animations && video_animations->animation_setEnableShowTrackSector) {
video_animations->animation_setEnableShowTrackSector(enabled);
}
}
@@ -305,8 +305,8 @@ void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetCPUSpeed(JNIEnv *env,
cpu_scale_factor = CPU_SCALE_SLOWEST;
}
if (video_backend->animation_showCPUSpeed) {
video_backend->animation_showCPUSpeed();
if (video_animations->animation_showCPUSpeed) {
video_animations->animation_showCPUSpeed();
}
timing_initialize();