X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=13be9acc514e87adad71598b5419732bafb5974e;hp=61f023f0069ceac3b603620240925e3d0e63a946;hb=056d67598872b0bac092878972633d6c10aa0ad6;hpb=45d45c1e22620ef51023d0b8e09e85db9cb9380c

diff --git a/frontend/main.c b/frontend/main.c
index 61f023f0..13be9acc 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
+#include <time.h>
 
 #include "main.h"
 #include "plugin.h"
@@ -24,6 +25,7 @@
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "common/plat.h"
 #include "common/input.h"
+#include "common/readpng.h"
 
 int ready_to_go;
 unsigned long gpuDisp;
@@ -34,9 +36,6 @@ enum sched_action emu_action, emu_action_old;
 char hud_msg[64];
 int hud_new_msg;
 
-// from softgpu plugin
-extern int UseFrameSkip;
-
 static void make_path(char *buf, size_t size, const char *dir, const char *fname)
 {
 	if (fname)
@@ -66,6 +65,24 @@ static void CheckSubDir() {
 	create_profile_dir(CHEATS_DIR);
 	create_profile_dir(PATCHES_DIR);
 	create_profile_dir(PCSX_DOT_DIR "cfg");
+	create_profile_dir("/screenshots/");
+}
+
+static int get_gameid_filename(char *buf, int size, const char *fmt, int i) {
+	char trimlabel[33];
+	int j;
+
+	strncpy(trimlabel, CdromLabel, 32);
+	trimlabel[32] = 0;
+	for (j = 31; j >= 0; j--)
+		if (trimlabel[j] == ' ')
+			trimlabel[j] = 0;
+		else
+			continue;
+
+	snprintf(buf, size, fmt, trimlabel, CdromId, i);
+
+	return 0;
 }
 
 void set_cd_image(const char *fname)
@@ -77,7 +94,7 @@ void set_cd_image(const char *fname)
 
 	if (ext && (
 	    strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 ||
-	    strcasecmp(ext, ".znx") == 0 || strcasecmp(ext, ".pbp") == 0)) {
+	    strcasecmp(ext, ".znx") == 0 /*|| strcasecmp(ext, ".pbp") == 0*/)) {
 		SetIsoFile(NULL);
 		cdrcimg_set_fname(fname);
 		strcpy(Config.Cdr, "builtin_cdrcimg");
@@ -105,8 +122,28 @@ static void set_default_paths(void)
 	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 }
 
+static void check_memcards(void)
+{
+	char buf[MAXPATHLEN];
+	FILE *f;
+	int i;
+
+	for (i = 1; i <= 9; i++) {
+		snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
+
+		f = fopen(buf, "rb");
+		if (f == NULL) {
+			printf("Creating memcard: %s\n", buf);
+			CreateMcd(buf);
+		}
+		else
+			fclose(f);
+	}
+}
+
 void do_emu_action(void)
 {
+	char buf[MAXPATHLEN];
 	int ret;
 
 	emu_action_old = emu_action;
@@ -136,10 +173,29 @@ void do_emu_action(void)
 			state_slot = 9;
 		goto do_state_slot;
 	case SACTION_TOGGLE_FSKIP:
-		UseFrameSkip ^= 1;
+		pl_rearmed_cbs.frameskip ^= 1;
 		snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s",
-			UseFrameSkip ? "ON" : "OFF");
+			pl_rearmed_cbs.frameskip ? "ON" : "OFF");
 		break;
+	case SACTION_SCREENSHOT:
+		{
+			void *scrbuf;
+			int w, h, bpp;
+			time_t t = time(NULL);
+			struct tm *tb = localtime(&t);
+			int ti = tb->tm_yday * 1000000 + tb->tm_hour * 10000 +
+				tb->tm_min * 100 + tb->tm_sec;
+
+			scrbuf = pl_prepare_screenshot(&w, &h, &bpp);
+			get_gameid_filename(buf, sizeof(buf),
+				"screenshots/%.32s-%.9s.%d.png", ti);
+			ret = -1;
+			if (scrbuf != 0 && bpp == 16)
+				ret = writepng(buf, scrbuf, w, h);
+			if (ret == 0)
+				snprintf(hud_msg, sizeof(hud_msg), "SCREENSHOT TAKEN");
+			break;
+		}
 	}
 	hud_new_msg = 3;
 	return;
@@ -176,6 +232,7 @@ int main(int argc, char *argv[])
 
 	CheckSubDir();
 	set_default_paths();
+	check_memcards();
 	strcpy(Config.Bios, "HLE");
 
 #ifdef MAEMO
@@ -185,12 +242,14 @@ int main(int argc, char *argv[])
 	char file[MAXPATHLEN] = "";
 	char path[MAXPATHLEN];
 	const char *cdfile = NULL;
+	const char *loadst_f = NULL;
+	int psxout = 0;
 	int loadst = 0;
 	int i;
 
 	// read command line options
 	for (i = 1; i < argc; i++) {
-		     if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
+		     if (!strcmp(argv[i], "-psxout")) psxout = 1;
 		else if (!strcmp(argv[i], "-load")) loadst = atol(argv[++i]);
 		else if (!strcmp(argv[i], "-cfg")) {
 			if (i+1 >= argc) break;
@@ -214,6 +273,10 @@ int main(int argc, char *argv[])
 
 			cdfile = isofilename;
 		}
+		else if (!strcmp(argv[i], "-loadf")) {
+			if (i+1 >= argc) break;
+			loadst_f = argv[++i];
+		}
 		else if (!strcmp(argv[i], "-h") ||
 			 !strcmp(argv[i], "-help") ||
 			 !strcmp(argv[i], "--help")) {
@@ -251,9 +314,12 @@ int main(int argc, char *argv[])
 
 	// frontend stuff
 	in_init();
-	in_probe();
+	//in_probe();
 	plat_init();
-	menu_init();
+	menu_init(); // loads config
+
+	if (psxout)
+		Config.PsxOut = 1;
 
 	if (LoadPlugins() == -1) {
 		// FIXME: this recovery doesn't work, just delete bad config and bail out
@@ -296,6 +362,10 @@ int main(int argc, char *argv[])
 			int ret = emu_load_state(loadst - 1);
 			printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
 		}
+		if (loadst_f) {
+			int ret = LoadState(loadst_f);
+			printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
+		}
 	}
 	else
 		menu_loop();
@@ -322,7 +392,7 @@ int SysInit() {
 		return -1;
 	}
 
-	LoadMcds(Config.Mcd1, Config.Mcd2);	/* TODO Do we need to have this here, or in the calling main() function?? */
+	LoadMcds(Config.Mcd1, Config.Mcd2);
 
 	if (Config.Debug) {
 		StartDebugger();
@@ -375,27 +445,14 @@ void OnFile_Exit() {
 #ifndef MAEMO
 	menu_finish();
 #endif
-	plat_finish();
 	SysClose();
+	plat_finish();
 	exit(0);
 }
 
 int get_state_filename(char *buf, int size, int i) {
-	char trimlabel[33];
-	int j;
-
-	strncpy(trimlabel, CdromLabel, 32);
-	trimlabel[32] = 0;
-	for (j = 31; j >= 0; j--)
-		if (trimlabel[j] == ' ')
-			trimlabel[j] = 0;
-		else
-			continue;
-
-	snprintf(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d",
-		trimlabel, CdromId, i);
-
-	return 0;
+	return get_gameid_filename(buf, size,
+		"." STATES_DIR "%.32s-%.9s.%3.3d", i);
 }
 
 int emu_check_state(int slot)