X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=maemo%2Fmain.c;h=eb757f0b89ade69cf09e6d540d24694965351b73;hp=481e9cd4d4a981a545ab8d0a1480b17c894b77e0;hb=79f216e32563acc81517729fe56a6f11f110b0a4;hpb=6d75977b13fede33db381324c610561c6e723a8b

diff --git a/maemo/main.c b/maemo/main.c
index 481e9cd4..eb757f0b 100644
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -21,6 +21,9 @@
 
 int g_opts = OPT_SHOWFPS;
 int g_maemo_opts;
+int g_scaler, soft_filter;
+int g_menuscreen_w, g_menuscreen_h;
+
 char file_name[MAXPATHLEN];
 
 enum sched_action emu_action;
@@ -38,20 +41,29 @@ static void ChangeWorkingDirectory(char *exe)
 	}
 }
 
-int maemo_main(int argc, char **argv)
+int main(int argc, char **argv)
 {
-	ChangeWorkingDirectory("c");
 	char file[MAXPATHLEN] = "";
 	char path[MAXPATHLEN];
 	const char *cdfile = NULL;
 	int loadst = 0;
 	int i;
 
+	emu_core_preinit();
+	ChangeWorkingDirectory("c");
+
 	strcpy(Config.BiosDir, "/home/user/MyDocs");
 	strcpy(Config.PluginsDir, "/opt/maemo/usr/games/plugins");
 	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "/opt/maemo/usr/games" PATCHES_DIR);
 	Config.PsxAuto = 1;
-	
+
+	g_menuscreen_w = 800;
+	g_menuscreen_h = 480;
+
+	pl_init();
+
+	emu_core_init();
+
 	// read command line options
 	for (i = 1; i < argc; i++) {
 		     if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
@@ -97,11 +109,6 @@ int maemo_main(int argc, char **argv)
 		strcpy(file_name, strrchr(cdfile,'/'));
 	}
 
-	if (SysInit() == -1)
-		return 1;
-
-	pl_init();
-
 	if (LoadPlugins() == -1) {
 		SysMessage("Failed loading plugins!");
 		return 1;
@@ -125,6 +132,7 @@ int maemo_main(int argc, char **argv)
 				printf(_("Could not load CD-ROM!\n"));
 				return -1;
 			}
+			emu_on_new_cd(0);
 			ready_to_go = 1;
 		}
 	}