#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
+#include <time.h>
#include "main.h"
#include "plugin.h"
#include "../plugins/cdrcimg/cdrcimg.h"
#include "common/plat.h"
#include "common/input.h"
+#include "common/readpng.h"
int ready_to_go;
unsigned long gpuDisp;
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)
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)
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");
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;
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;
CheckSubDir();
set_default_paths();
+ check_memcards();
strcpy(Config.Bios, "HLE");
#ifdef MAEMO
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;
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")) {
// 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
}
}
- // If a state has been specified, then load that
- if (loadst) {
- int ret = emu_load_state(loadst - 1);
- printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
- }
-
- if (ready_to_go)
+ if (ready_to_go) {
menu_prepare_emu();
+
+ // If a state has been specified, then load that
+ if (loadst) {
+ 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();
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();
#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)
if (ret != 0)
return ret;
- return SaveState(fname);
+ ret = SaveState(fname);
+ printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
+ return ret;
}
int emu_load_state(int slot)
notaz.gp2x.de / pcsx_rearmed.git / blobdiff