From eb676cd833d512613531ffe8f5b039dcd08d5045 Mon Sep 17 00:00:00 2001 From: Shaun Inman Date: Sun, 15 Jan 2023 20:12:24 -0500 Subject: [PATCH] retired the mmenu path --- skeleton/.system/rg35xx/paks/MinUI.pak/launch.sh | 1 - src/common/defines.h | 6 +++--- src/minui/main.c | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/skeleton/.system/rg35xx/paks/MinUI.pak/launch.sh b/skeleton/.system/rg35xx/paks/MinUI.pak/launch.sh index ba1616d..3695657 100755 --- a/skeleton/.system/rg35xx/paks/MinUI.pak/launch.sh +++ b/skeleton/.system/rg35xx/paks/MinUI.pak/launch.sh @@ -12,7 +12,6 @@ export PATH=$SYSTEM_PATH/bin:$PATH export LD_LIBRARY_PATH=$SYSTEM_PATH/lib:$LD_LIBRARY_PATH mkdir -p "$LOGS_PATH" -mkdir -p "$USERDATA_PATH/.mmenu" mkdir -p "$USERDATA_PATH/.minui" CPU_PATH="/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor" diff --git a/src/common/defines.h b/src/common/defines.h index ba99ff3..b7a29eb 100644 --- a/src/common/defines.h +++ b/src/common/defines.h @@ -40,9 +40,9 @@ #define LAST_PATH "/tmp/last.txt" // transient #define CHANGE_DISC_PATH "/tmp/change_disc.txt" -#define RESUME_SLOT_PATH "/tmp/mmenu_slot.txt" -#define AUTO_RESUME_PATH USERDATA_PATH "/.miniui/auto_resume.txt" -#define AUTO_RESUME_SLOT "9" +#define RESUME_SLOT_PATH "/tmp/resume_slot.txt" +#define AUTO_RESUME_PATH USERDATA_PATH "/.minui/auto_resume.txt" +#define AUTO_RESUME_SLOT 9 #define TRIAD_WHITE 0xff,0xff,0xff #define TRIAD_BLACK 0x00,0x00,0x00 diff --git a/src/minui/main.c b/src/minui/main.c index 58b0401..e0b035f 100644 --- a/src/minui/main.c +++ b/src/minui/main.c @@ -485,7 +485,7 @@ static int Entry_useAlt(Entry* self) { if (tmp) strcpy(rom_name, tmp+1); char use_alt[256]; - sprintf(use_alt, "%s/.mmenu/%s/%s.use-alt", USERDATA_PATH, emu_name, rom_name); + sprintf(use_alt, "%s/.minui/%s/%s.use-alt", USERDATA_PATH, emu_name, rom_name); self->use_alt = exists(use_alt); } @@ -504,7 +504,7 @@ static int Entry_toggleAlt(Entry* self) { if (tmp) strcpy(rom_name, tmp+1); char use_alt_path[256]; - sprintf(use_alt_path, "%s/.mmenu/%s/%s.use-alt", USERDATA_PATH, emu_name, rom_name); + sprintf(use_alt_path, "%s/.minui/%s/%s.use-alt", USERDATA_PATH, emu_name, rom_name); if (self->use_alt==1) touch(use_alt_path); else unlink(use_alt_path); @@ -954,7 +954,7 @@ static void readyResumePath(char* rom_path, int type) { tmp = strrchr(path, '/') + 1; strcpy(rom_file, tmp); - sprintf(slot_path, "%s/.mmenu/%s/%s.txt", USERDATA_PATH, emu_name, rom_file); // /.userdata/.mmenu//.ext.txt + sprintf(slot_path, "%s/.minui/%s/%s.txt", USERDATA_PATH, emu_name, rom_file); // /.userdata/.minui//.ext.txt can_resume = exists(slot_path); } @@ -990,10 +990,10 @@ static int autoResume(void) { if (!exists(emu_path)) return 0; // putFile(LAST_PATH, FAUX_RECENT_PATH); // saveLast() will crash here because top is NULL - + char cmd[256]; sprintf(cmd, "'%s' '%s'", escapeSingleQuotes(emu_path), escapeSingleQuotes(sd_path)); - putFile(RESUME_SLOT_PATH, AUTO_RESUME_SLOT); + putInt(RESUME_SLOT_PATH, AUTO_RESUME_SLOT); queueNext(cmd); return 1; } @@ -1039,7 +1039,7 @@ static void openRom(char* path, char* last) { // get disc for state char disc_path_path[256]; - sprintf(disc_path_path, "%s/.mmenu/%s/%s.%s.txt", USERDATA_PATH, emu_name, rom_file, slot); // /.userdata/.mmenu//.ext.0.txt + sprintf(disc_path_path, "%s/.minui/%s/%s.%s.txt", USERDATA_PATH, emu_name, rom_file, slot); // /.userdata/.minui//.ext.0.txt if (exists(disc_path_path)) { // switch to disc path