cdrom: attempt to deal with broken subq :(

[pcsx_rearmed.git] / maemo / hildon.c

diff --git a/maemo/hildon.c b/maemo/hildon.c
index dc5e497..43e3e15 100644 (file)
--- a/maemo/hildon.c
+++ b/maemo/hildon.c
@@ -4,11 +4,12 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <hildon/hildon.h>
-#include "plugin_lib.h"
 
+#include "plugin_lib.h"
 #include "main.h"
+#include "plat.h"
 #include "../libpcsxcore/psemu_plugin_defs.h"
-#include "common/readpng.h"
+#include "libpicofe/readpng.h"
 #include "maemo_common.h"
 
 #define X_RES           800
@@ -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,18 @@ void maemo_init(int *argc, char ***argv)
 
        gtk_widget_show_all (GTK_WIDGET (actor));
        gtk_widget_show_all (GTK_WIDGET (window));
-}
 
-void menu_loop(void)
-{
+       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;
+
+       pl_rearmed_cbs.only_16bpp = 1;
 }
 
-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 +215,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 +245,11 @@ void *hildon_flip(void)
        return pl_vout_buf;
 }
 
-int omap_enable_layer(int enabled)
+void plat_gvideo_open(int is_pal)
 {
-       return 0;
 }
 
-void menu_notify_mode_change(int w, int h, int bpp)
+void plat_gvideo_close(void)
 {
 }
 
@@ -258,3 +258,10 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp)
        return NULL;
 }
 
+void plat_trigger_vibrate(int is_strong)
+{
+}
+
+void menu_notify_mode_change(int w, int h, int bpp)
+{
+}