revive pandora and win32 builds, rm gp2x dep for linux, lots of refactoring

[libpicofe.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 00cbac7..b0ad4ba 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -69,15 +69,15 @@ int main(int argc, char *argv[])
 \r
        /* in_init() must go before config, config accesses in_ fwk */\r
        in_init();\r
-       emu_prepareDefaultConfig();\r
-       emu_ReadConfig(0, 0);\r
+       emu_prep_defconfig();\r
+       emu_read_config(0, 0);\r
        config_readlrom(PicoConfigFile);\r
 \r
        plat_init();\r
        in_probe();\r
        in_debug_dump();\r
 \r
-       emu_Init();\r
+       emu_init();\r
        menu_init();\r
 \r
        engineState = PGS_Menu;\r
@@ -87,11 +87,11 @@ int main(int argc, char *argv[])
 \r
        if (engineState == PGS_ReloadRom)\r
        {\r
-               if (emu_ReloadRom(rom_fname_reload)) {\r
+               if (emu_reload_rom(rom_fname_reload)) {\r
                        engineState = PGS_Running;\r
                        if (load_state_slot >= 0) {\r
                                state_slot = load_state_slot;\r
-                               emu_SaveLoadGame(1, 0);\r
+                               emu_save_load_game(1, 0);\r
                        }\r
                }\r
        }\r
@@ -104,8 +104,12 @@ int main(int argc, char *argv[])
                                menu_loop();\r
                                break;\r
 \r
+                       case PGS_TrayMenu:\r
+                               menu_loop_tray();\r
+                               break;\r
+\r
                        case PGS_ReloadRom:\r
-                               if (emu_ReloadRom(rom_fname_reload))\r
+                               if (emu_reload_rom(rom_fname_reload))\r
                                        engineState = PGS_Running;\r
                                else {\r
                                        printf("PGS_ReloadRom == 0\n");\r
@@ -115,9 +119,10 @@ int main(int argc, char *argv[])
 \r
                        case PGS_RestartRun:\r
                                engineState = PGS_Running;\r
+                               /* vvv fallthrough */\r
 \r
                        case PGS_Running:\r
-                               emu_Loop();\r
+                               emu_loop();\r
                                break;\r
 \r
                        case PGS_Quit:\r
@@ -131,7 +136,7 @@ int main(int argc, char *argv[])
 \r
        endloop:\r
 \r
-       emu_Deinit();\r
+       emu_finish();\r
        plat_finish();\r
 \r
        return 0;\r