frontend: support analog controller using nubs; some refactoring

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index 37c9ba3..3344819 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -20,6 +20,7 @@
 #include "pcnt.h"
 #include "menu.h"
 #include "../libpcsxcore/misc.h"
+#include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "common/plat.h"
 #include "common/input.h"
@@ -64,14 +65,12 @@ void set_cd_image(const char *fname)
 {
        const char *ext = NULL;
        
-       if (fname != NULL) {
-               int len = strlen(fname);
-               ext = fname;
-               if (len > 2)
-                       ext = fname + len - 2;
-       }
+       if (fname != NULL)
+               ext = strrchr(fname, '.');
 
-       if (ext && strcasecmp(ext, ".z") == 0) {
+       if (ext && (
+           strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 ||
+           strcasecmp(ext, ".znx") == 0 || strcasecmp(ext, ".pbp") == 0)) {
                SetIsoFile(NULL);
                cdrcimg_set_fname(fname);
                strcpy(Config.Cdr, "builtin_cdrcimg");
@@ -101,12 +100,7 @@ static void set_default_paths(void)
 
 int main(int argc, char *argv[])
 {
-       char file[MAXPATHLEN] = "";
-       char path[MAXPATHLEN];
-       const char *cdfile = NULL;
-       int loadst = 0;
        void *tmp;
-       int i;
 
        tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY);
        if (tmp == NULL)
@@ -126,6 +120,22 @@ int main(int argc, char *argv[])
        emuLog = stdout;
        SetIsoFile(NULL);
 
+       memset(&Config, 0, sizeof(Config));
+
+       CheckSubDir();
+       set_default_paths();
+       strcpy(Config.Bios, "HLE");
+
+#ifdef MAEMO
+       extern int maemo_main(int argc, char **argv);
+       return maemo_main(argc, argv);
+#else
+       char file[MAXPATHLEN] = "";
+       char path[MAXPATHLEN];
+       const char *cdfile = NULL;
+       int loadst = 0;
+       int i;
+
        // read command line options
        for (i = 1; i < argc; i++) {
                     if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
@@ -181,12 +191,6 @@ int main(int argc, char *argv[])
                }
        }
 
-       memset(&Config, 0, sizeof(PcsxConfig));
-
-       CheckSubDir();
-       set_default_paths();
-       strcpy(Config.Bios, "HLE");
-
        if (cdfile)
                set_cd_image(cdfile);
 
@@ -250,11 +254,13 @@ int main(int argc, char *argv[])
 
        while (1)
        {
+               stop = 0;
                psxCpu->Execute();
                menu_loop();
        }
 
        return 0;
+#endif
 }
 
 int SysInit() {
@@ -313,7 +319,9 @@ void SysUpdate() {
 
 void OnFile_Exit() {
        printf("OnFile_Exit\n");
+#ifndef MAEMO
        menu_finish();
+#endif
        plat_finish();
        SysClose();
        exit(0);