notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: remove funcs from assert()s to allow NDEBUG build
[pcsx_rearmed.git]
/
frontend
/
plugin_lib.c
diff --git
a/frontend/plugin_lib.c
b/frontend/plugin_lib.c
index
9f9e958
..
93640c3
100644
(file)
--- a/
frontend/plugin_lib.c
+++ b/
frontend/plugin_lib.c
@@
-62,7
+62,7
@@
static void print_cpu_usage(void)
pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
}
pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
}
-
int
pl_fbdev_set_mode(int w, int h, int bpp)
+
void *
pl_fbdev_set_mode(int w, int h, int bpp)
{
void *ret;
{
void *ret;
@@
-82,19
+82,23
@@
int pl_fbdev_set_mode(int w, int h, int bpp)
menu_notify_mode_change(w, h, bpp);
menu_notify_mode_change(w, h, bpp);
- return
(ret != NULL) ? 0 : -1
;
+ return
pl_fbdev_buf
;
}
}
-void pl_fbdev_flip(void)
+void
*
pl_fbdev_flip(void)
{
flip_cnt++;
{
flip_cnt++;
- if (g_opts & OPT_SHOWFPS)
- print_fps();
- if (g_opts & OPT_SHOWCPU)
- print_cpu_usage();
+
+ if (pl_fbdev_buf != NULL) {
+ if (g_opts & OPT_SHOWFPS)
+ print_fps();
+ if (g_opts & OPT_SHOWCPU)
+ print_cpu_usage();
+ }
// let's flip now
pl_fbdev_buf = vout_fbdev_flip(layer_fb);
// let's flip now
pl_fbdev_buf = vout_fbdev_flip(layer_fb);
+ return pl_fbdev_buf;
}
int pl_fbdev_open(void)
}
int pl_fbdev_open(void)
@@
-117,6
+121,11
@@
static void update_input(void)
if (actions[IN_BINDTYPE_EMU] & PEV_MENU)
stop = 1;
keystate = actions[IN_BINDTYPE_PLAYER12];
if (actions[IN_BINDTYPE_EMU] & PEV_MENU)
stop = 1;
keystate = actions[IN_BINDTYPE_PLAYER12];
+
+#ifdef X11
+ extern void x11_update_keys(void);
+ x11_update_keys();
+#endif
}
/* called on every vsync */
}
/* called on every vsync */
@@
-197,7
+206,14
@@
static void pl_get_layer_pos(int *x, int *y, int *w, int *h)
*h = g_layer_h;
}
*h = g_layer_h;
}
+extern int UseFrameSkip; // hmh
+
const struct rearmed_cbs pl_rearmed_cbs = {
pl_get_layer_pos,
const struct rearmed_cbs pl_rearmed_cbs = {
pl_get_layer_pos,
+ pl_fbdev_open,
+ pl_fbdev_set_mode,
+ pl_fbdev_flip,
+ pl_fbdev_close,
+ &UseFrameSkip,
};
};