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
frontend: avoid potential alignment fault
[pcsx_rearmed.git]
/
maemo
/
hildon.c
diff --git
a/maemo/hildon.c
b/maemo/hildon.c
index
0399909
..
8e7635a
100644
(file)
--- a/
maemo/hildon.c
+++ b/
maemo/hildon.c
@@
-7,6
+7,7
@@
#include "plugin_lib.h"
#include "main.h"
#include "plugin_lib.h"
#include "main.h"
+#include "plat.h"
#include "../libpcsxcore/psemu_plugin_defs.h"
#include "common/readpng.h"
#include "maemo_common.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
#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;
static GdkImage *image;
static HildonAnimationActor *actor;
static GtkWidget *window, *drawing;
@@
-181,14
+178,22
@@
void maemo_init(int *argc, char ***argv)
gtk_widget_show_all (GTK_WIDGET (actor));
gtk_widget_show_all (GTK_WIDGET (window));
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;
+
+ pl_rearmed_cbs.only_16bpp = 1;
}
void menu_loop(void)
{
}
}
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;
if (w <= 0 || h <= 0)
return pl_vout_buf;
@@
-214,7
+219,7
@@
void *hildon_set_mode(int w, int h)
return pl_vout_buf;
}
return pl_vout_buf;
}
-void *
hildon
_flip(void)
+void *
plat_gvideo
_flip(void)
{
gtk_widget_queue_draw (drawing);
{
gtk_widget_queue_draw (drawing);
@@
-244,12
+249,11
@@
void *hildon_flip(void)
return pl_vout_buf;
}
return pl_vout_buf;
}
-
int omap_enable_layer(int enable
d)
+
void plat_gvideo_open(voi
d)
{
{
- return 0;
}
}
-void
menu_notify_mode_change(int w, int h, int bpp
)
+void
plat_gvideo_close(void
)
{
}
{
}
@@
-262,7
+266,7
@@
void plat_step_volume(int is_up)
{
}
{
}
-void plat_trigger_vibrate(
void
)
+void plat_trigger_vibrate(
int is_strong
)
{
}
{
}