diff --git a/NetStream-DE/download_enabler.c b/NetStream-DE/download_enabler.c index fe4d404..0a72dc3 100644 --- a/NetStream-DE/download_enabler.c +++ b/NetStream-DE/download_enabler.c @@ -75,6 +75,7 @@ int module_start(SceSize args, const void * argp) case 0xF476E785: // 3.71 retail case 0x939FFBE9: // 3.72 retail case 0x734D476A: // 3.73 retail + case 0x51CB6207: // 3.74 retail { hooks[0] = taiHookFunctionOffset(&GetFileTypeRef, info.modid, 0, 0x11B63C, 1, GetFileTypePatched); break; diff --git a/NetStream-libScePafPreload/libScePafPreload.vcxproj b/NetStream-libScePafPreload/libScePafPreload.vcxproj deleted file mode 100644 index b964fe9..0000000 --- a/NetStream-libScePafPreload/libScePafPreload.vcxproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Debug - PSVita - - - Release - PSVita - - - - {584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D} - - - - DynamicLibrary - - - DynamicLibrary - - - - - - - - - - - - - - - - - - - - - - - - _DEBUG;%(PreprocessorDefinitions); - true - NotUsing - - - --no-required-files - -lSceSysmodule_stub;-lSceAppmgr_stub;%(AdditionalDependencies) - $(SCE_PSP2_SDK_DIR)\target\lib\vdsuite;%(AdditionalLibraryDirectories) - - - - - NDEBUG;%(PreprocessorDefinitions); - Level3 - NotUsing - - - --no-required-files - StripSymsAndDebug - -lSceSysmodule_stub;-lSceAppmgr_stub;%(AdditionalDependencies) - $(SCE_PSP2_SDK_DIR)\target\lib\vdsuite;%(AdditionalLibraryDirectories) - StripFuncsAndData - true - - - "$(SCE_PSP2_SDK_DIR)/host_tools/build/bin/vdsuite-pubprx.exe" --strip --compress "$(LocalDebuggerCommand)" "$(LocalDebuggerCommand)" -copy /Y "$(LocalDebuggerCommand)" "$(SolutionDir)NetStream\CONTENTS\module\libScePafPreload.suprx" - - - - - - - - - - \ No newline at end of file diff --git a/NetStream-libScePafPreload/libScePafPreload.vcxproj.filters b/NetStream-libScePafPreload/libScePafPreload.vcxproj.filters deleted file mode 100644 index d7e45bc..0000000 --- a/NetStream-libScePafPreload/libScePafPreload.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;cc;s;asm - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp - - - - - Source Files - - - \ No newline at end of file diff --git a/NetStream-libScePafPreload/libScePafPreload.vcxproj.user b/NetStream-libScePafPreload/libScePafPreload.vcxproj.user deleted file mode 100644 index be25078..0000000 --- a/NetStream-libScePafPreload/libScePafPreload.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/NetStream-libScePafPreload/prx.c b/NetStream-libScePafPreload/prx.c deleted file mode 100644 index f3e766d..0000000 --- a/NetStream-libScePafPreload/prx.c +++ /dev/null @@ -1,73 +0,0 @@ -#include -#include - -int sceAppMgrGrowMemory3(unsigned int a1, int a2); - -//#define GROW_MEMORY - -typedef struct SceSysmoduleOpt { - int flags; - int *result; - int unused[2]; -} SceSysmoduleOpt; - -typedef struct ScePafInit { - SceSize global_heap_size; - int a2; - int a3; - int cdlg_mode; - int heap_opt_param1; - int heap_opt_param2; -} ScePafInit; // size is 0x18 - -int __module_stop(SceSize argc, const void *args) -{ - return SCE_KERNEL_STOP_SUCCESS; -} - -int __module_exit() -{ - return SCE_KERNEL_STOP_SUCCESS; -} - -int __module_start(SceSize argc, void *args) -{ - SceInt32 ret = -1, load_res; - - ScePafInit init_param; - SceSysmoduleOpt sysmodule_opt; - -#ifdef GROW_MEMORY - - init_param.global_heap_size = 4 * 1024 * 1024; - - //Grow memory if possible - ret = sceAppMgrGrowMemory3(41 * 1024 * 1024, 1); // 57 MB - if (ret < 0) { - ret = sceAppMgrGrowMemory3(16 * 1024 * 1024, 1); // 32 MB - if (ret == 0) - init_param.global_heap_size = 14 * 1024 * 1024; - } - else - init_param.global_heap_size = 25 * 1024 * 1024; -#else - init_param.global_heap_size = 128 * 1024 * 1024; -#endif - init_param.a2 = 0x0000EA60; - init_param.a3 = 0x00040000; - init_param.cdlg_mode = 0; - init_param.heap_opt_param1 = 0; - init_param.heap_opt_param2 = 0; - - sysmodule_opt.flags = 0; // with arg - sysmodule_opt.result = &load_res; - - ret = sceSysmoduleLoadModuleInternalWithArg(SCE_SYSMODULE_INTERNAL_PAF, sizeof(init_param), &init_param, &sysmodule_opt); - - if (ret < 0) { - sceClibPrintf("[PAF PRX] Loader: 0x%x\n", ret); - sceClibPrintf("[PAF PRX] Loader result: 0x%x\n", load_res); - } - - return SCE_KERNEL_START_NO_RESIDENT; -} \ No newline at end of file diff --git a/NetStream.sln b/NetStream.sln index c6ef50d..9710dc6 100644 --- a/NetStream.sln +++ b/NetStream.sln @@ -6,11 +6,8 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetStream", "NetStream\NetStream.vcxproj", "{CA4F859F-6FE6-413C-A24A-44CF552FCE91}" ProjectSection(ProjectDependencies) = postProject {A6BB4747-BD6A-4DFC-B213-236038A9E766} = {A6BB4747-BD6A-4DFC-B213-236038A9E766} - {584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D} = {584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libScePafPreload", "NetStream-libScePafPreload\libScePafPreload.vcxproj", "{584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetStream-DE", "NetStream-DE\NetStream-DE.vcxproj", "{A6BB4747-BD6A-4DFC-B213-236038A9E766}" EndProject Global @@ -23,10 +20,6 @@ Global {CA4F859F-6FE6-413C-A24A-44CF552FCE91}.Debug|PSVita.Build.0 = Debug|PSVita {CA4F859F-6FE6-413C-A24A-44CF552FCE91}.Release|PSVita.ActiveCfg = Release|PSVita {CA4F859F-6FE6-413C-A24A-44CF552FCE91}.Release|PSVita.Build.0 = Release|PSVita - {584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}.Debug|PSVita.ActiveCfg = Debug|PSVita - {584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}.Debug|PSVita.Build.0 = Debug|PSVita - {584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}.Release|PSVita.ActiveCfg = Release|PSVita - {584C4FE4-880C-4EF6-9E2A-22BBE98EBA2D}.Release|PSVita.Build.0 = Release|PSVita {A6BB4747-BD6A-4DFC-B213-236038A9E766}.Debug|PSVita.ActiveCfg = Debug|PSVita {A6BB4747-BD6A-4DFC-B213-236038A9E766}.Debug|PSVita.Build.0 = Debug|PSVita {A6BB4747-BD6A-4DFC-B213-236038A9E766}.Release|PSVita.ActiveCfg = Release|PSVita diff --git a/NetStream/CONTENTS/module/download_enabler_netstream.suprx b/NetStream/CONTENTS/module/download_enabler_netstream.suprx index 7217f7d..f715b0d 100644 Binary files a/NetStream/CONTENTS/module/download_enabler_netstream.suprx and b/NetStream/CONTENTS/module/download_enabler_netstream.suprx differ diff --git a/NetStream/CONTENTS/module/libSceHttpForBEAVCorePlayer.suprx b/NetStream/CONTENTS/module/libSceHttpForBEAVCorePlayer.suprx index fc3d1dd..d4eaedc 100644 Binary files a/NetStream/CONTENTS/module/libSceHttpForBEAVCorePlayer.suprx and b/NetStream/CONTENTS/module/libSceHttpForBEAVCorePlayer.suprx differ diff --git a/NetStream/CONTENTS/module/libScePafPreload.suprx b/NetStream/CONTENTS/module/libScePafPreload.suprx deleted file mode 100644 index c72b904..0000000 Binary files a/NetStream/CONTENTS/module/libScePafPreload.suprx and /dev/null differ diff --git a/NetStream/CONTENTS/netstream_plugin.rcd b/NetStream/CONTENTS/netstream_plugin.rcd index d0a1697..380dba8 100644 --- a/NetStream/CONTENTS/netstream_plugin.rcd +++ b/NetStream/CONTENTS/netstream_plugin.rcd @@ -70,10 +70,11 @@ key:a246c545(0) id:plane_obj2 key:f808f140(0) id:style_button_option_top key:a4f80dc0(0) id:style_button_option_bottom key:29d701c3(0) id:style_button_option_middle +key:9d28f73d(0) id:style_text_option_menu_ruler +key:a56e4ba2(0) id:text_obj1 key:aaa827ae(0) id:style_plane_black key:44a21a77(0) id:style_busyindicator_big key:1bc003d9(0) id:style_text_top_title_bar -key:a56e4ba2(0) id:text_obj1 key:fad63dd9(0) id:style_list_view_generic key:885879e0(0) id:style_list_view_item_generic key:e6cd9335(0) id:style_image_button_list_button @@ -116,6 +117,7 @@ key:41c21f50(0) id:style_button_yt_comment key:ed36b1c7(0) id:template_option_menu_base key:655c6a32(0) id:button_option_menu_close key:4446ff86(0) id:plane_option_menu_base +key:c9cdb2cc(0) id:text_option_menu_ruler key:ae3d8acd(0) id:box_option_menu key:9227a229(0) id:template_option_menu_button_single key:242a5612(0) id:button_option_menu_single @@ -198,6 +200,7 @@ key:a8d8a98c(0) id:tex_fpmenu_icon_ftp key:01add48c(0) id:tex_fpmenu_icon_local key:5aa46fb7(0) id:tex_file_icon_video key:deab6c16(0) id:tex_file_icon_folder +key:fb08ccb2(0) id:tex_file_icon_playlist key:289b9013(0) id:tex_file_icon_unsupported key:974eadf7(0) id:tex_black key:ff3d36d8(0) id:tex_button_expand diff --git a/NetStream/CONTENTS/netstream_plugin.rco b/NetStream/CONTENTS/netstream_plugin.rco index 64531fd..d2e76e4 100644 Binary files a/NetStream/CONTENTS/netstream_plugin.rco and b/NetStream/CONTENTS/netstream_plugin.rco differ diff --git a/NetStream/NetStream.vcxproj b/NetStream/NetStream.vcxproj index 6c5c322..3161187 100644 --- a/NetStream/NetStream.vcxproj +++ b/NetStream/NetStream.vcxproj @@ -121,7 +121,7 @@ --no-standard-libraries $(SCE_PSP2_SDK_DIR)\target\lib\vdsuite;$(ProjectDir)libs\lib;%(AdditionalLibraryDirectories) FullMapFile - -lSceIpmi_stub;-lSceSysmem_stub;-lSceThreadMgr_stub;-lSceThreadmgrCoredumpTime_stub;-lSceModuleMgr_stub;-lSceProcessMgr_stub;-lSceTouch_stub;-lSceAppMgr_stub;-lSceAppMgrUser_stub;-lSceAppUtil_stub;-lSceAudio_stub;-lSceCtrl_stub;-lSceDisplay_stub;-lScePower_stub;-lSceSysmodule_stub;-lSceGxm_stub;-lSceDbg_stub;-lScePafThread_stub;-lScePafStdc_stub;-lScePafToplevel_stub;-lScePafResource_stub;-lScePafWidget_stub;-lScePafMisc_stub;-lScePafCommon_stub;-lScePafGraphics_stub;-lSceLibKernel_stub;-lSceNet_stub;-lSceNetCtl_stub;-lSceHttp_stub;-lSceSsl_stub;-lSceAppSettings_stub;-lSceCommonGuiDialog_stub;-lSceIniFileProcessor_stub;-lSceBEAVCorePlayer_stub;-lSceDmacmgr_stub;-lSceFiber_stub;-lSceVshBridge_stub;-ltaihenUnsafe_stub;-lInvidious_stub;-lLootkit_stub;-lcurl_stub;-lsnc;-lCurlFile;%(AdditionalDependencies) + -lSceIpmi_stub;-lSceSysmem_stub;-lSceThreadMgr_stub;-lSceThreadmgrCoredumpTime_stub;-lSceModuleMgr_stub;-lSceProcessMgr_stub;-lSceTouch_stub;-lSceAppMgr_stub;-lSceAppMgrUser_stub;-lSceAppUtil_stub;-lSceAudio_stub;-lSceCtrl_stub;-lSceDisplay_stub;-lScePower_stub;-lSceSysmodule_stub;-lSceGxm_stub;-lSceDbg_stub;-lScePafThread_stub;-lScePafStdc_stub;-lScePafToplevel_stub;-lScePafResource_stub;-lScePafWidget_stub;-lScePafMisc_stub;-lScePafCommon_stub;-lScePafGraphics_stub;-lSceLibKernel_stub;-lSceNet_stub;-lSceNetCtl_stub;-lSceHttp_stub;-lSceSsl_stub;-lSceAppSettings_stub;-lSceCommonGuiDialog_stub;-lSceIniFileProcessor_stub;-lSceBEAVCorePlayer_stub;-lSceDmacmgr_stub;-lSceFiber_stub;-lSceVshBridge_stub;-ltaihenUnsafe_stub;-lInvidious_stub;-lLootkit_stub;-lcurl_stub;-lsnc;-lPafFileExt;%(AdditionalDependencies) "$(SCE_PSP2_SDK_DIR)/host_tools/build/bin/vdsuite-pubprx.exe" --boot-param "$(ProjectDir)ebootparam.bin" "$(LocalDebuggerCommand)" "$(OutDir)eboot.bin" @@ -154,7 +154,7 @@ true --no-standard-libraries - -lSceIpmi_stub;-lSceSysmem_stub;-lSceThreadMgr_stub;-lSceThreadmgrCoredumpTime_stub;-lSceModuleMgr_stub;-lSceProcessMgr_stub;-lSceTouch_stub;-lSceAppMgr_stub;-lSceAppMgrUser_stub;-lSceAppUtil_stub;-lSceAudio_stub;-lSceCtrl_stub;-lSceDisplay_stub;-lScePower_stub;-lSceSysmodule_stub;-lSceGxm_stub;-lSceDbg_stub;-lScePafThread_stub;-lScePafStdc_stub;-lScePafToplevel_stub;-lScePafResource_stub;-lScePafWidget_stub;-lScePafMisc_stub;-lScePafCommon_stub;-lScePafGraphics_stub;-lSceLibKernel_stub;-lSceNet_stub;-lSceNetCtl_stub;-lSceAppSettings_stub;-lSceCommonGuiDialog_stub;-lSceIniFileProcessor_stub;-lSceBEAVCorePlayer_stub;-lSceDmacmgr_stub;-lSceFiber_stub;-lSceVshBridge_stub;-ltaihenUnsafe_stub;-lInvidious_stub;-lLootkit_stub;-lcurl_stub;-lsnc;-lCurlFile;%(AdditionalDependencies) + -lSceIpmi_stub;-lSceSysmem_stub;-lSceThreadMgr_stub;-lSceThreadmgrCoredumpTime_stub;-lSceModuleMgr_stub;-lSceProcessMgr_stub;-lSceTouch_stub;-lSceAppMgr_stub;-lSceAppMgrUser_stub;-lSceAppUtil_stub;-lSceAudio_stub;-lSceCtrl_stub;-lSceDisplay_stub;-lScePower_stub;-lSceSysmodule_stub;-lSceGxm_stub;-lSceDbg_stub;-lScePafThread_stub;-lScePafStdc_stub;-lScePafToplevel_stub;-lScePafResource_stub;-lScePafWidget_stub;-lScePafMisc_stub;-lScePafCommon_stub;-lScePafGraphics_stub;-lSceLibKernel_stub;-lSceNet_stub;-lSceNetCtl_stub;-lSceAppSettings_stub;-lSceCommonGuiDialog_stub;-lSceIniFileProcessor_stub;-lSceBEAVCorePlayer_stub;-lSceDmacmgr_stub;-lSceFiber_stub;-lSceVshBridge_stub;-ltaihenUnsafe_stub;-lInvidious_stub;-lLootkit_stub;-lcurl_stub;-lsnc;-lPafFileExt;%(AdditionalDependencies) call "$(ProjectDir)gen_rco.bat" diff --git a/NetStream/RES_RCO/file/netstream_settings.xml b/NetStream/RES_RCO/file/netstream_settings.xml index b3f23a9..2baaef1 100644 --- a/NetStream/RES_RCO/file/netstream_settings.xml +++ b/NetStream/RES_RCO/file/netstream_settings.xml @@ -14,8 +14,16 @@ - + + + + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_en.xml b/NetStream/RES_RCO/locale/netstream_locale_en.xml index ae03fe9..aba6a8d 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_en.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_en.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_es.xml b/NetStream/RES_RCO/locale/netstream_locale_es.xml index 328c1f4..01db90c 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_es.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_es.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_it.xml b/NetStream/RES_RCO/locale/netstream_locale_it.xml index 33b38bf..b962e65 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_it.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_it.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_ja.xml b/NetStream/RES_RCO/locale/netstream_locale_ja.xml index f7d4a11..18837f5 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_ja.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_ja.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_pl.xml b/NetStream/RES_RCO/locale/netstream_locale_pl.xml index 28a471c..e41e123 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_pl.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_pl.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_pt-br.xml b/NetStream/RES_RCO/locale/netstream_locale_pt-br.xml index 7d59252..f763173 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_pt-br.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_pt-br.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_pt.xml b/NetStream/RES_RCO/locale/netstream_locale_pt.xml index e2a080a..1bae061 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_pt.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_pt.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_ru.xml b/NetStream/RES_RCO/locale/netstream_locale_ru.xml index 373b2a8..343a4f5 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_ru.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_ru.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_zh-s.xml b/NetStream/RES_RCO/locale/netstream_locale_zh-s.xml index 8580558..c322493 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_zh-s.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_zh-s.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/locale/netstream_locale_zh-t.xml b/NetStream/RES_RCO/locale/netstream_locale_zh-t.xml index 062fa57..ce72b56 100644 --- a/NetStream/RES_RCO/locale/netstream_locale_zh-t.xml +++ b/NetStream/RES_RCO/locale/netstream_locale_zh-t.xml @@ -40,6 +40,12 @@ + + + + + + diff --git a/NetStream/RES_RCO/netstream_plugin.xml b/NetStream/RES_RCO/netstream_plugin.xml index c863b9b..90e7a96 100644 --- a/NetStream/RES_RCO/netstream_plugin.xml +++ b/NetStream/RES_RCO/netstream_plugin.xml @@ -231,6 +231,9 @@ + + + @@ -379,7 +382,10 @@ - + + + + @@ -599,6 +605,7 @@ + diff --git a/NetStream/RES_RCO/texture/sd-128.png b/NetStream/RES_RCO/texture/sd-128.png deleted file mode 100644 index 22fa4c6..0000000 Binary files a/NetStream/RES_RCO/texture/sd-128.png and /dev/null differ diff --git a/NetStream/RES_RCO/texture/tex_file_icon_playlist.png b/NetStream/RES_RCO/texture/tex_file_icon_playlist.png new file mode 100644 index 0000000..9e28253 Binary files /dev/null and b/NetStream/RES_RCO/texture/tex_file_icon_playlist.png differ diff --git a/NetStream/gen_rco.bat b/NetStream/gen_rco.bat index 5249486..995b646 100644 --- a/NetStream/gen_rco.bat +++ b/NetStream/gen_rco.bat @@ -1,6 +1,6 @@ @echo off SET PLUGIN=netstream_plugin -SET PYTHON=%SCE_PSP2_SDK_DIR%/host_tools/build/rco/Python27/python.exe +SET PYTHON=python.exe SET Z=%SCE_PSP2_SDK_DIR%/host_tools/build/rco/bin\zdrop.exe SET D=%SCE_PSP2_SDK_DIR%/host_tools/build/rco/bin\psp2rcd.exe SET RCS=%SCE_PSP2_SDK_DIR%/host_tools/build/rco/cxml/appinfo/rcs_compiler.py diff --git a/NetStream/include/beav_player.h b/NetStream/include/beav_player.h index 18260f8..7240f45 100644 --- a/NetStream/include/beav_player.h +++ b/NetStream/include/beav_player.h @@ -6,7 +6,7 @@ #include #include "common.h" -#include "curl_file.h" +#include using namespace paf; diff --git a/NetStream/include/local_server_browser.h b/NetStream/include/local_server_browser.h index 5d42b90..9edd276 100644 --- a/NetStream/include/local_server_browser.h +++ b/NetStream/include/local_server_browser.h @@ -13,6 +13,8 @@ class LocalServerBrowser : public GenericServerBrowser { public: + static bool DefaultFsSort(const LocalServerBrowser::Entry* a, const LocalServerBrowser::Entry* b); + LocalServerBrowser(); ~LocalServerBrowser(); diff --git a/NetStream/include/menus/menu_generic.h b/NetStream/include/menus/menu_generic.h index cb78635..bc4a659 100644 --- a/NetStream/include/menus/menu_generic.h +++ b/NetStream/include/menus/menu_generic.h @@ -111,6 +111,14 @@ namespace menu { virtual ~GenericMenu(); + virtual SceVoid Activate(); + + virtual SceVoid Deactivate(); + + virtual SceVoid DisableInput(); + + virtual SceVoid EnableInput(); + virtual MenuType GetMenuType() = 0; virtual const SceUInt32 *GetSupportedSettingsItems(SceInt32 *count) = 0; @@ -119,6 +127,8 @@ namespace menu { private: + static SceVoid DeactivatorFwCbFun(SceInt32 eventId, ui::Widget *self, SceInt32 a3, ScePVoid pUserData); + Plugin::PageCloseParam closeParam; }; @@ -132,9 +142,9 @@ namespace menu { menu::GenericMenu *GetMenuAt(SceUInt32 idx); - SceVoid HideAll(SceUInt32 endMargin = 0); + SceVoid DeactivateAll(SceUInt32 endMargin = 0); - SceVoid ShowAll(); + SceVoid ActivateAll(); } diff --git a/NetStream/include/menus/menu_settings.h b/NetStream/include/menus/menu_settings.h index 792182d..5e2345e 100644 --- a/NetStream/include/menus/menu_settings.h +++ b/NetStream/include/menus/menu_settings.h @@ -40,27 +40,27 @@ namespace menu { private: - static SceVoid CBListChange(const char *elementId); + static SceVoid CBOnStartPageTransition(const char *elementId, SceInt32 type); - static SceVoid CBListForwardChange(const char *elementId); + static SceVoid CBOnPageActivate(const char *elementId, SceInt32 type); - static SceVoid CBListBackChange(const char *elementId); + static SceVoid CBOnPageDeactivate(const char *elementId, SceInt32 type); - static SceInt32 CBIsVisible(const char *elementId, SceBool *pIsVisible); + static SceInt32 CBOnCheckVisible(const char *elementId, SceBool *pIsVisible); - static SceInt32 CBElemInit(const char *elementId); + static SceInt32 CBOnPreCreate(const char *elementId, sce::AppSettings::Element *element); - static SceInt32 CBElemAdd(const char *elementId, paf::ui::Widget *widget); + static SceInt32 CBOnPostCreate(const char *elementId, paf::ui::Widget *widget); - static SceInt32 CBValueChange(const char *elementId, const char *newValue); + static SceInt32 CBOnPress(const char *elementId, const char *newValue); - static SceInt32 CBValueChange2(const char *elementId, const char *newValue); + static SceInt32 CBOnPress2(const char *elementId, const char *newValue); - static SceVoid CBTerm(); + static SceVoid CBOnTerm(SceInt32 result); - static wchar_t *CBGetString(const char *elementId); + static wchar_t *CBOnGetString(const char *elementId); - static SceInt32 CBGetTex(graph::Surface **tex, const char *elementId); + static SceInt32 CBOnGetSurface(graph::Surface **surf, const char *elementId); CloseCallback closeCb; ScePVoid closeCbUserArg; diff --git a/NetStream/include/netstream_locale.h b/NetStream/include/netstream_locale.h index 1a14f54..bd5591f 100644 --- a/NetStream/include/netstream_locale.h +++ b/NetStream/include/netstream_locale.h @@ -38,6 +38,12 @@ #define msg_ftp_nlst (0xc8025a39) #define msg_ftp_nlst_hint (0x8bac33a4) #define msg_local_playlist_prefix (0x4278708e) +#define msg_local_sort_name (0xd5e8c8fa) +#define msg_local_sort_type (0x02c5dfcb) +#define msg_option_local_sort_name_0 (0x6ae3e929) +#define msg_option_local_sort_name_1 (0x27cace63) +#define msg_option_local_sort_type_0 (0x07755294) +#define msg_option_local_sort_type_1 (0xa20432c9) #define msg_youtube_quality (0xc3f81023) #define msg_youtube_hls_quality (0x20d26d06) #define msg_youtube_inv_instance (0x40157a95) diff --git a/NetStream/include/netstream_plugin.h b/NetStream/include/netstream_plugin.h index 0905325..396e2ba 100644 --- a/NetStream/include/netstream_plugin.h +++ b/NetStream/include/netstream_plugin.h @@ -74,10 +74,11 @@ #define style_button_option_top (0xf808f140) #define style_button_option_bottom (0xa4f80dc0) #define style_button_option_middle (0x29d701c3) +#define style_text_option_menu_ruler (0x9d28f73d) +#define text_obj1 (0xa56e4ba2) #define style_plane_black (0xaaa827ae) #define style_busyindicator_big (0x44a21a77) #define style_text_top_title_bar (0x1bc003d9) -#define text_obj1 (0xa56e4ba2) #define style_list_view_generic (0xfad63dd9) #define style_list_view_item_generic (0x885879e0) #define style_image_button_list_button (0xe6cd9335) @@ -120,6 +121,7 @@ #define template_option_menu_base (0xed36b1c7) #define button_option_menu_close (0x655c6a32) #define plane_option_menu_base (0x4446ff86) +#define text_option_menu_ruler (0xc9cdb2cc) #define box_option_menu (0xae3d8acd) #define template_option_menu_button_single (0x9227a229) #define button_option_menu_single (0x242a5612) @@ -202,6 +204,7 @@ #define tex_fpmenu_icon_local (0x01add48c) #define tex_file_icon_video (0x5aa46fb7) #define tex_file_icon_folder (0xdeab6c16) +#define tex_file_icon_playlist (0xfb08ccb2) #define tex_file_icon_unsupported (0x289b9013) #define tex_black (0x974eadf7) #define tex_button_expand (0xff3d36d8) diff --git a/NetStream/include/netstream_settings.h b/NetStream/include/netstream_settings.h index 1f099a0..0a47fcb 100644 --- a/NetStream/include/netstream_settings.h +++ b/NetStream/include/netstream_settings.h @@ -19,6 +19,12 @@ #define ftp_nlst (0xd6f1d921) #define local_setting (0x988ec70c) #define local_playlist_prefix (0xa088d09c) +#define list_local_sort_name (0xf7bca884) +#define list_local_sort_name_00 (0x8b449a7a) +#define list_local_sort_name_01 (0xa0340593) +#define list_local_sort_type (0x6e2b969f) +#define list_local_sort_type_00 (0x8cca7adf) +#define list_local_sort_type_01 (0x996d8e98) #define youtube_search_setting (0x47942f14) #define youtube_inv_instance (0xb938b374) #define list_youtube_search_sort (0xcf6d2a1c) diff --git a/NetStream/include/option_menu.h b/NetStream/include/option_menu.h index f833b73..945d457 100644 --- a/NetStream/include/option_menu.h +++ b/NetStream/include/option_menu.h @@ -6,6 +6,8 @@ using namespace paf; +#define OPTION_MENU_BUTTON_MAGIC 0xa5448baf + class OptionMenu { public: @@ -19,7 +21,7 @@ class OptionMenu wstring label; }; - OptionMenu(Plugin *workPlugin, ui::Widget *root, vector