diff options
Diffstat (limited to 'maemo')
| -rw-r--r-- | maemo/hildon.c | 13 | ||||
| -rw-r--r-- | maemo/main.c | 7 |
2 files changed, 13 insertions, 7 deletions
diff --git a/maemo/hildon.c b/maemo/hildon.c index df42a90..37e67af 100644 --- a/maemo/hildon.c +++ b/maemo/hildon.c @@ -5,6 +5,7 @@ #include <unistd.h> #include <hildon/hildon.h> #include "plugin_lib.h" +#include "main.h" #include "../libpcsxcore/psemu_plugin_defs.h" #define X_RES 800 @@ -80,10 +81,12 @@ window_key_proxy(GtkWidget *widget, psxkey2 = DKEY_RIGHT; break; case 19: - //SaveState(cfile); + if (event->type == GDK_KEY_PRESS) + emu_set_action(SACTION_SAVE_STATE); return; case 20: - //LoadState(cfile); + if (event->type == GDK_KEY_PRESS) + emu_set_action(SACTION_LOAD_STATE); return; } @@ -98,6 +101,8 @@ window_key_proxy(GtkWidget *widget, in_keystate &= ~(1 << psxkey1); if (psxkey2 >= 0) in_keystate &= ~(1 << psxkey2); + + emu_set_action(SACTION_NONE); } } @@ -148,6 +153,10 @@ void maemo_init(int *argc, char ***argv) gtk_widget_show_all (GTK_WIDGET (window)); } +void menu_loop(void) +{ +} + void *pl_fbdev_set_mode(int w, int h, int bpp) { if (w <= 0 || h <= 0) diff --git a/maemo/main.c b/maemo/main.c index 80919ac..f797c12 100644 --- a/maemo/main.c +++ b/maemo/main.c @@ -173,11 +173,8 @@ int maemo_main(int argc, char **argv) // If a state has been specified, then load that if (loadst) { - char state_filename[MAXPATHLEN]; - int ret = get_state_filename(state_filename, sizeof(state_filename), loadst - 1); - if (ret == 0) - ret = LoadState(state_filename); - printf("%s state %s\n", ret ? "failed to load" : "loaded", state_filename); + int ret = emu_load_state(loadst - 1); + printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst); } if (ready_to_go) |