diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx index c479f1126..cfd9f3bdc 100644 Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx and b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx differ diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx index 34dfe597b..c20d9e3c4 100644 Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx and b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx differ diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx index 37495e818..5a105d1a6 100644 Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx and b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx differ diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx index 70d71fadb..5a3c3ea55 100644 Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx and b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx differ diff --git a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx index c479f1126..cfd9f3bdc 100644 Binary files a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx and b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx differ diff --git a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx index 37495e818..5a105d1a6 100644 Binary files a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx and b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx differ diff --git a/include/_mount.h b/include/_mount.h index 898f62ccf..37be8fb0e 100644 --- a/include/_mount.h +++ b/include/_mount.h @@ -896,6 +896,8 @@ static void set_app_home(const char *game_path) // mount custom app in /app_home/PS3_GAME if has USRDIR/EBOOT.BIN if(!game_path && (webman_config->homeb && is_app_dir(webman_config->home_url, "."))) sys_map_path(APP_HOME_DIR, webman_config->home_url); + else if(IS(game_path, PKGLAUNCH_DIR)) + sys_map_path(APP_HOME_DIR, PKGLAUNCH_DIR "/PS3_GAME"); else sys_map_path(APP_HOME_DIR, game_path); diff --git a/include/file.h b/include/file.h index 173be9f2a..fd9bdcb24 100644 --- a/include/file.h +++ b/include/file.h @@ -1401,19 +1401,24 @@ static bool do_custom_combo(const char *filename) #endif #ifdef COBRA_ONLY + #ifndef LITE_EDITION static void map_visualizer(u8 visualizer_id, u8 id, char *param) { - char *hdd_path = visualizer_id ? (char*)"/dev_hdd0/tmp/canyon" : - (char*)"/dev_hdd0/tmp/earth"; - char *qrc_path = visualizer_id ? (char*)"/dev_flash/vsh/resource/qgl/canyon.qrc" : - (char*)"/dev_flash/vsh/resource/qgl/earth.qrc"; + char *hdd_path = (visualizer_id == 1) ? (char*)"/dev_hdd0/tmp/canyon" : + (visualizer_id == 2) ? (char*)"/dev_hdd0/tmp/lines" : + (char*)"/dev_hdd0/tmp/earth"; + char *qrc_path = (visualizer_id == 1) ? (char*)"/dev_flash/vsh/resource/qgl/canyon.qrc" : + (visualizer_id == 2) ? (char*)"/dev_flash/vsh/resource/qgl/lines.qrc" : + (char*)"/dev_flash/vsh/resource/qgl/earth.qrc"; if(isDir(hdd_path)) { if(!id) { - if(visualizer_id) + if(visualizer_id == 1) id = webman_config->canyon_id; + else if(visualizer_id == 2) + id = webman_config->lines_id; else id = webman_config->earth_id; id++; @@ -1427,15 +1432,18 @@ static void map_visualizer(u8 visualizer_id, u8 id, char *param) sprintf(param, "%s", qrc_path); id = 0; } - if(visualizer_id) + if(visualizer_id == 1) webman_config->canyon_id = id; + else if(visualizer_id == 2) + webman_config->lines_id = id; else webman_config->earth_id = id; save_settings(); } } -#endif + #endif // #ifndef LITE_EDITION +#endif // #ifdef COBRA_ONLY #ifdef MOUNT_ROMS static void copy_rom_media(char *src_path) diff --git a/include/games_html.h b/include/games_html.h index 5f38c4746..4a61c41db 100644 --- a/include/games_html.h +++ b/include/games_html.h @@ -2,7 +2,7 @@ #define SUFIX2(a) ((a==1)?" (1)":(a==2)?" (2)":(a==3)?" (3)":(a==4)?" (4)":"") #define SUFIX3(a) ((a==1)?" (1).ntfs[":(a==2)?" (2).ntfs[":(a==3)?" (3).ntfs[":(a==4)?" (4).ntfs[":"") -#define ROMS_EXTENSIONS ".ZIP.GBA.NES.UNIF.GB.GBC.DMG.MD.SMD.GEN.SMS.GG.SG.IOS.FLAC.NGP.NGC.PCE.SGX.VB.VBOY.WS.WSC.FDS.EXE.WAD.IWAD.SMC.FIG.SFC.GD3.GD7.DX2.BSX.SWC.A26.PAK.LUA.ADF.DMS.FDI.IPF.UAE.A78.MGW.LNX.VEC.J64.JAG.PRG.XFD.XEX" +#define ROMS_EXTENSIONS ".ZIP.GBA.BIN.NES.UNIF.GB.GBC.DMG.MD.SMD.GEN.SMS.GG.SG.IOS.FLAC.NGP.NGC.PCE.SGX.VB.VBOY.WS.WSC.FDS.EXE.WAD.IWAD.SMC.FIG.SFC.GD3.GD7.DX2.BSX.SWC.A26.PAK.LUA.ADF.DMS.FDI.IPF.UAE.A78.MGW.LNX.VEC.J64.JAG.PRG.XFD.XEX" // paths: 0="GAMES", 1="GAMEZ", 2="PS3ISO", 3="BDISO", 4="DVDISO", 5="PS2ISO", 6="PSXISO", 7="PSXGAMES", 8="PSPISO", 9="ISO", 10="video", 11="GAMEI", 12="ROMS" diff --git a/include/mount_misc.h b/include/mount_misc.h index 94d4950a6..1a5cde17a 100644 --- a/include/mount_misc.h +++ b/include/mount_misc.h @@ -121,7 +121,7 @@ mount_unk = EMU_ROMS; - if(!(webman_config->app_home) && launch_app_home_icon()) ret = true; + if(!(webman_config->app_home) && launch_app_home_icon()) {set_app_home(PKGLAUNCH_DIR); ret = true;} goto mounting_done; //goto exit_mount; } diff --git a/include/wm_config.h b/include/wm_config.h index cc13db958..c0eced736 100644 --- a/include/wm_config.h +++ b/include/wm_config.h @@ -163,8 +163,9 @@ typedef struct u8 earth_id; // 0-255: select a different #.qrc in /dev_hdd0/tmp/earth on each boot u8 msg_icon; // 0=VSH notify with icon, 1=vshtask_notify (info) u8 canyon_id;// 0-255: select a different #.qrc in /dev_hdd0/tmp/canyon on each boot + u8 lines_id; // 0-255: select a different #.qrc in /dev_hdd0/tmp/lines on each boot - u8 padding11[28]; + u8 padding11[27]; // spoof console id diff --git a/include/www_client.h b/include/www_client.h index cac4e2fe5..5041a77b6 100644 --- a/include/www_client.h +++ b/include/www_client.h @@ -1536,12 +1536,15 @@ static void handleclient_www(u64 conn_s_p) goto exit_handleclient_www; } - else if(islike(param, "/earth.ps3") || islike(param, "/canyon.ps3")) + else if(islike(param, "/earth.ps3") || islike(param, "/canyon.ps3") || islike(param, "/lines.ps3")) { - u8 visualizer_id = (param[1] == 'c'); // 0 = earth, 1 = canyon + u8 visualizer_id = (param[1] == 'c') ? 1 : + (param[1] == 'l') ? 2 : 0; // 0 = earth, 1 = canyon, 2 = lines - if(param[visualizer_id + 10] == '?') - map_visualizer(visualizer_id, (u8)val(param + visualizer_id + 11), param); + u8 param_id = (visualizer_id & 1); // 0 = earth/lines, 1 = canyon + + if(param[param_id + 10] == '?') + map_visualizer(visualizer_id, (u8)val(param + param_id + 11), param); else map_visualizer(visualizer_id, 0, param); diff --git a/include/www_start.h b/include/www_start.h index 7e96149f0..a62f3e1bd 100644 --- a/include/www_start.h +++ b/include/www_start.h @@ -145,9 +145,11 @@ if(conn_s_p == START_DAEMON || conn_s_p == REFRESH_CONTENT) #ifdef COBRA_ONLY {sys_map_path("/dev_flash/vsh/resource/coldboot_stereo.ac3", NULL);} {sys_map_path("/dev_flash/vsh/resource/coldboot_multi.ac3", NULL);} + #ifndef LITE_EDITION map_visualizer(0, 0, param); map_visualizer(1, 0, param); #endif + #endif #ifdef PLAY_MUSIC if(webman_config->music) diff --git a/main.c b/main.c index 0761e073f..4a8a9951d 100644 --- a/main.c +++ b/main.c @@ -463,18 +463,21 @@ static void wwwd_thread(u64 arg) led(YELLOW, BLINK_FAST); -#ifdef COPY_PS3 - memset(cp_path, 0, STD_PATH_LEN); -#endif - //WebmanCfg *webman_config = (WebmanCfg*) wmconfig; read_settings(); +#ifdef COBRA_ONLY + #ifndef LITE_EDITION + map_visualizer(2, 0, html_base_path); + #endif +#endif + if(webman_config->blind) enable_dev_blind(NO_MSG); set_buffer_sizes(webman_config->foot); #ifdef COPY_PS3 + memset(cp_path, 0, STD_PATH_LEN); parse_script("/dev_hdd0/boot_init.txt"); #endif