From 6469a8c407ff23af8b7a6218f759b368eec7c339 Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 22 Apr 2012 01:56:22 +0300 Subject: frontend: clean up some hacks --- maemo/hildon.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'maemo') diff --git a/maemo/hildon.c b/maemo/hildon.c index 08949ff..8948c3b 100644 --- a/maemo/hildon.c +++ b/maemo/hildon.c @@ -7,6 +7,7 @@ #include "plugin_lib.h" #include "main.h" +#include "plat.h" #include "../libpcsxcore/psemu_plugin_defs.h" #include "common/readpng.h" #include "maemo_common.h" @@ -16,10 +17,6 @@ #define D_WIDTH 640 #define D_HEIGHT 480 -int g_layer_x = (X_RES - D_WIDTH) / 2; -int g_layer_y = (Y_RES - D_HEIGHT) / 2; -int g_layer_w = D_WIDTH, g_layer_h = D_HEIGHT; - static GdkImage *image; static HildonAnimationActor *actor; static GtkWidget *window, *drawing; @@ -181,14 +178,20 @@ void maemo_init(int *argc, char ***argv) gtk_widget_show_all (GTK_WIDGET (actor)); gtk_widget_show_all (GTK_WIDGET (window)); + + g_layer_x = (X_RES - D_WIDTH) / 2; + g_layer_y = (Y_RES - D_HEIGHT) / 2; + g_layer_w = D_WIDTH, g_layer_h = D_HEIGHT; } void menu_loop(void) { } -void *hildon_set_mode(int w, int h) +void *plat_gvideo_set_mode(int *w_, int *h_, int *bpp_) { + int w = *w_, h = *h_; + if (w <= 0 || h <= 0) return pl_vout_buf; @@ -214,7 +217,7 @@ void *hildon_set_mode(int w, int h) return pl_vout_buf; } -void *hildon_flip(void) +void *plat_gvideo_flip(void) { gtk_widget_queue_draw (drawing); @@ -244,12 +247,11 @@ void *hildon_flip(void) return pl_vout_buf; } -int omap_enable_layer(int enabled) +void plat_gvideo_open(void) { - return 0; } -void menu_notify_mode_change(int w, int h, int bpp) +void plat_gvideo_close(void) { } -- cgit v1.2.3