mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge: Delete screenshot in-game feature in favor of ScreenshotDaemon app

Browse source
This commit is contained in:
Mauro 2023-06-03 18:31:41 -03:00 • committed by GitHub
commit acdb6b58db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
makefile
View file

@ -108,14 +108,14 @@ zip:
cd ./build/PAYLOAD && zip -r MinUI.zip .system cd ./build/PAYLOAD && zip -r MinUI.zip .system
mv ./build/PAYLOAD/MinUI.zip ./build/BASE mv ./build/PAYLOAD/MinUI.zip ./build/BASE
cd ./build/BASE && zip -r ../../releases/$(RELEASE_NAME)-base.zip Bios Roms Saves Screenshots dmenu.bin MinUI.zip README.txt INSTALL.txt SHORTCUTS.txt cd ./build/BASE && zip -r ../../releases/$(RELEASE_NAME)-base.zip Bios Roms Saves dmenu.bin MinUI.zip README.txt INSTALL.txt SHORTCUTS.txt
cd ./build/EXTRAS && zip -r ../../releases/$(RELEASE_NAME)-extras.zip Bios Emus Roms Saves Screenshots Tools README.txt cd ./build/EXTRAS && zip -r ../../releases/$(RELEASE_NAME)-extras.zip Bios Emus Roms Saves Tools README.txt
rm -fr ./build/FULL rm -fr ./build/FULL
mkdir ./build/FULL mkdir ./build/FULL
cp -fR ./build/BASE/* ./build/FULL/ cp -fR ./build/BASE/* ./build/FULL/
cp -fR ./build/EXTRAS/* ./build/FULL/ cp -fR ./build/EXTRAS/* ./build/FULL/
cd ./build/FULL && zip -r ../../releases/$(RELEASE_NAME)-full.zip Bios Emus Roms Saves Screenshots Tools dmenu.bin MinUI.zip INSTALL.txt SHORTCUTS.txt cd ./build/FULL && zip -r ../../releases/$(RELEASE_NAME)-full.zip Bios Emus Roms Saves Tools dmenu.bin MinUI.zip INSTALL.txt SHORTCUTS.txt
echo "$(RELEASE_NAME)" > ./build/latest.txt echo "$(RELEASE_NAME)" > ./build/latest.txt

1
skeleton/SYSTEM/rg35xx/paks/MinUI.pak/launch.sh
View file

@ -7,7 +7,6 @@ export SYSTEM_PATH="$SDCARD_PATH/.system/rg35xx"
export CORES_PATH="$SYSTEM_PATH/cores" export CORES_PATH="$SYSTEM_PATH/cores"
export USERDATA_PATH="$SDCARD_PATH/.userdata/rg35xx" export USERDATA_PATH="$SDCARD_PATH/.userdata/rg35xx"
export LOGS_PATH="$USERDATA_PATH/logs" export LOGS_PATH="$USERDATA_PATH/logs"
export SCREENSHOTS_PATH="$SDCARD_PATH/Screenshots"
####################################### #######################################

1
src/common/defines.h
View file

@ -60,7 +60,6 @@
#define FAUX_FAVORITE_PATH SDCARD_PATH "/Favorites" #define FAUX_FAVORITE_PATH SDCARD_PATH "/Favorites"
#define COLLECTIONS_PATH SDCARD_PATH "/Collections" #define COLLECTIONS_PATH SDCARD_PATH "/Collections"
#define BATTERY_PATH SDCARD_PATH "/battery.txt" #define BATTERY_PATH SDCARD_PATH "/battery.txt"
#define SCREENSHOTS_PATH SDCARD_PATH "/Screenshots"
#define ADB_FLAG_PATH SDCARD_PATH "/enableADB" #define ADB_FLAG_PATH SDCARD_PATH "/enableADB"
#define ALIASES_PATH SDCARD_PATH "/Roms/aliases.txt" #define ALIASES_PATH SDCARD_PATH "/Roms/aliases.txt"

45
src/minarch/minarch.c
View file

@ -549,46 +549,6 @@ static void State_resume(void) {
State_read(); State_read();
state_slot = last_state_slot; state_slot = last_state_slot;
} }
static void Take_screenshot(void) {
char bmp_path[256];
char screenshot_dir[256];
sprintf(screenshot_dir, SCREENSHOTS_PATH);
mkdir(screenshot_dir, 0755);
SDL_Surface* backing = GFX_getBufferCopy();
SDL_Surface* snapshot = SDL_CreateRGBSurface(SDL_SWSURFACE, FIXED_WIDTH,FIXED_HEIGHT,FIXED_DEPTH,0,0,0,0);
if (backing->w==FIXED_WIDTH && backing->h==FIXED_HEIGHT) {
SDL_BlitSurface(backing, NULL, snapshot, NULL);
}
else {
Downsample(backing->pixels,snapshot->pixels,backing->w,backing->h,backing->pitch,snapshot->pitch);
}
// Get the current date and time for the screenshot filename
time_t currentTime = time(NULL);
struct tm* timeinfo = localtime(&currentTime);
int day = timeinfo->tm_mday;
int month = timeinfo->tm_mon + 1;
int year = timeinfo->tm_year + 1900;
int hours = timeinfo->tm_hour;
int minutes = timeinfo->tm_min;
int seconds = timeinfo->tm_sec;
// Convert hours and minutes to strings
char timeStr[16];
snprintf(timeStr, sizeof(timeStr), "%04d%02d%02d_%02d%02d%02d", year, month, day, hours, minutes, seconds);
sprintf(bmp_path, "%s/%s.bmp", screenshot_dir, timeStr);
SDL_RWops* out = SDL_RWFromFile(bmp_path, "wb");
SDL_SaveBMP_RW(snapshot, out, 1);
SDL_FreeSurface(snapshot);
SDL_FreeSurface(backing);
}
/////////////////////////////// ///////////////////////////////
@ -666,7 +626,6 @@ enum {
SHORTCUT_TOGGLE_SCANLINES, SHORTCUT_TOGGLE_SCANLINES,
SHORTCUT_TOGGLE_FF, SHORTCUT_TOGGLE_FF,
SHORTCUT_HOLD_FF, SHORTCUT_HOLD_FF,
SHORTCUT_TAKE_SCREENSHOT,
SHORTCUT_COUNT, SHORTCUT_COUNT,
}; };
@ -906,7 +865,6 @@ static struct Config {
[SHORTCUT_TOGGLE_SCANLINES] = {"Toggle Scanlines", -1, BTN_ID_NONE, 0}, [SHORTCUT_TOGGLE_SCANLINES] = {"Toggle Scanlines", -1, BTN_ID_NONE, 0},
[SHORTCUT_TOGGLE_FF] = {"Toggle FF", -1, BTN_ID_NONE, 0}, [SHORTCUT_TOGGLE_FF] = {"Toggle FF", -1, BTN_ID_NONE, 0},
[SHORTCUT_HOLD_FF] = {"Hold FF", -1, BTN_ID_NONE, 0}, [SHORTCUT_HOLD_FF] = {"Hold FF", -1, BTN_ID_NONE, 0},
[SHORTCUT_TAKE_SCREENSHOT] = {"Take Screenshot", -1, BTN_ID_NONE, 0},
{NULL} {NULL}
}, },
}; };
@ -1491,9 +1449,6 @@ static void input_poll_callback(void) {
Config_syncFrontend(FE_OPT_SCANLINES, !show_scanlines); Config_syncFrontend(FE_OPT_SCANLINES, !show_scanlines);
} }
break; break;
case SHORTCUT_TAKE_SCREENSHOT:
Take_screenshot();
break;
default: break; default: break;
} }