X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=9f9e958cd00322d911ef578a606aa7361958ad5d;hp=83ae892008f9526888bacce8e0b913cf3265b5b2;hb=201c21e2ad6be25a4b843d1434eabb432ce72884;hpb=15d46930b3898d3976eeb5b345f13cb33a4bce95

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 83ae8920..9f9e958c 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -62,12 +62,6 @@ static void print_cpu_usage(void)
 		pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
 }
 
-int pl_fbdev_init(void)
-{
-	pl_fbdev_buf = vout_fbdev_flip(layer_fb);
-	return 0;
-}
-
 int pl_fbdev_set_mode(int w, int h, int bpp)
 {
 	void *ret;
@@ -86,7 +80,7 @@ int pl_fbdev_set_mode(int w, int h, int bpp)
 	else
 		pl_fbdev_buf = ret;
 
-	menu_notify_mode_change(w, h);
+	menu_notify_mode_change(w, h, bpp);
 
 	return (ret != NULL) ? 0 : -1;
 }
@@ -94,15 +88,25 @@ int pl_fbdev_set_mode(int w, int h, int bpp)
 void pl_fbdev_flip(void)
 {
 	flip_cnt++;
-	print_fps();
-	print_cpu_usage();
+	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);
 }
 
-void pl_fbdev_finish(void)
+int pl_fbdev_open(void)
+{
+	pl_fbdev_buf = vout_fbdev_flip(layer_fb);
+	omap_enable_layer(1);
+	return 0;
+}
+
+void pl_fbdev_close(void)
 {
+	omap_enable_layer(0);
 }
 
 static void update_input(void)
@@ -132,8 +136,9 @@ void pl_frame_limit(void)
 	if (tv.tv_sec != oldsec) {
 		flips_per_sec = flip_cnt;
 		flip_cnt = 0;
-		tick_per_sec = get_cpu_ticks();
 		oldsec = tv.tv_sec;
+		if (g_opts & OPT_SHOWCPU)
+			tick_per_sec = get_cpu_ticks();
 	}
 #ifdef PCNT
 	static int ya_vsync_count;
@@ -184,3 +189,15 @@ void pl_text_out16(int x, int y, const char *texto, ...)
 	pl_text_out16_(x, y, buffer);
 }
 
+static void pl_get_layer_pos(int *x, int *y, int *w, int *h)
+{
+	*x = g_layer_x;
+	*y = g_layer_y;
+	*w = g_layer_w;
+	*h = g_layer_h;
+}
+
+const struct rearmed_cbs pl_rearmed_cbs = {
+	pl_get_layer_pos,
+};
+