diff --git a/NetStream/CONTENTS/module/libInvidious.suprx b/NetStream/CONTENTS/module/libInvidious.suprx
index c47bf4b..3271194 100644
Binary files a/NetStream/CONTENTS/module/libInvidious.suprx and b/NetStream/CONTENTS/module/libInvidious.suprx differ
diff --git a/NetStream/CONTENTS/netstream_plugin.rcd b/NetStream/CONTENTS/netstream_plugin.rcd
index 73ebaf8..1ebbbea 100644
--- a/NetStream/CONTENTS/netstream_plugin.rcd
+++ b/NetStream/CONTENTS/netstream_plugin.rcd
@@ -1,6 +1,6 @@
# generated by acdc from RES_RCO/netstream_plugin.xml
-key:58087ba2(0) id:empva_plugin
+key:b2fabc6f(0) id:netstream_plugin
key:e63e6133(0) id:page_first
key:94c4a1ca(1) id:plane_base_bg_page_first
key:3f9ee201(0) id:template_ref_top_title_bar_page_first
diff --git a/NetStream/CONTENTS/netstream_plugin.rco b/NetStream/CONTENTS/netstream_plugin.rco
index 23f1c6d..3562ccc 100644
Binary files a/NetStream/CONTENTS/netstream_plugin.rco and b/NetStream/CONTENTS/netstream_plugin.rco differ
diff --git a/NetStream/RES_RCO/locale/netstream_locale_en.xml b/NetStream/RES_RCO/locale/netstream_locale_en.xml
index caf7c19..576d12a 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_en.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_en.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_es.xml b/NetStream/RES_RCO/locale/netstream_locale_es.xml
index 9cc25d9..6507527 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_es.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_es.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_fr.xml b/NetStream/RES_RCO/locale/netstream_locale_fr.xml
index 27c5bf5..5372cb3 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_fr.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_fr.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_it.xml b/NetStream/RES_RCO/locale/netstream_locale_it.xml
index 2c1e7e0..b6a9601 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_it.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_it.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_ja.xml b/NetStream/RES_RCO/locale/netstream_locale_ja.xml
index 0e0db3e..b159737 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_ja.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_ja.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_pl.xml b/NetStream/RES_RCO/locale/netstream_locale_pl.xml
index ecd643c..dce0440 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_pl.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_pl.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_pt-br.xml b/NetStream/RES_RCO/locale/netstream_locale_pt-br.xml
index b992677..1a692ef 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_pt-br.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_pt-br.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_pt.xml b/NetStream/RES_RCO/locale/netstream_locale_pt.xml
index 9590d28..235d970 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_pt.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_pt.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_ru.xml b/NetStream/RES_RCO/locale/netstream_locale_ru.xml
index 9f3700a..06be02f 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_ru.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_ru.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_zh-s.xml b/NetStream/RES_RCO/locale/netstream_locale_zh-s.xml
index d3116ea..7334eba 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_zh-s.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_zh-s.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/locale/netstream_locale_zh-t.xml b/NetStream/RES_RCO/locale/netstream_locale_zh-t.xml
index f4061b1..6d6f967 100644
--- a/NetStream/RES_RCO/locale/netstream_locale_zh-t.xml
+++ b/NetStream/RES_RCO/locale/netstream_locale_zh-t.xml
@@ -84,8 +84,6 @@
-
-
diff --git a/NetStream/RES_RCO/netstream_plugin.xml b/NetStream/RES_RCO/netstream_plugin.xml
index 343f892..5bed8b8 100644
--- a/NetStream/RES_RCO/netstream_plugin.xml
+++ b/NetStream/RES_RCO/netstream_plugin.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/NetStream/include/menus/menu_player_youtube.h b/NetStream/include/menus/menu_player_youtube.h
index 66a9725..4638284 100644
--- a/NetStream/include/menus/menu_player_youtube.h
+++ b/NetStream/include/menus/menu_player_youtube.h
@@ -138,8 +138,8 @@ namespace menu {
ui::Text *stat0;
ui::Text *stat1;
ui::Text *stat2;
- ui::Widget *expandButton;
- ui::Widget *favButton;
+ ui::Button *expandButton;
+ ui::Button *favButton;
ui::Widget *companelBase;
ui::Widget *commentButton;
ui::Widget *descButton;
diff --git a/NetStream/libs/include/invidious.h b/NetStream/libs/include/invidious.h
index 96b4599..52ee03b 100644
--- a/NetStream/libs/include/invidious.h
+++ b/NetStream/libs/include/invidious.h
@@ -99,6 +99,7 @@ typedef struct InvItemVideo
const char *description;
const char *subCount;
SceInt32 likeCount;
+ const char *baseHlsUrl;
} InvItemVideo;
typedef struct InvItemPlaylist
@@ -168,8 +169,8 @@ INV_EXPORT SceInt32 invCleanupComments(InvItemComment *item);
INV_EXPORT SceInt32 invCleanupHlsComments(InvItemComment *item);
-INV_EXPORT SceInt32 invGetHlsUrl(const char *videoId, InvHlsQuality quality, char *hlsUrl, SceInt32 sizeOfUrl);
+INV_EXPORT SceInt32 invGetHlsUrl(InvItemVideo *item, InvHlsQuality quality, char *hlsUrl, SceInt32 sizeOfUrl);
-INV_EXPORT SceInt32 invGetProxyUrl(const char *videoId, InvProxyType type, char *proxyUrl, SceInt32 sizeOfUrl);
+INV_EXPORT SceInt32 invGetProxyUrl(InvItemVideo *item, InvProxyType type, char *proxyUrl, SceInt32 sizeOfUrl);
SCE_CDECL_END
diff --git a/NetStream/param.sfx b/NetStream/param.sfx
index a5d51af..7035dce 100644
--- a/NetStream/param.sfx
+++ b/NetStream/param.sfx
@@ -1,6 +1,6 @@
- 03.11
+ 03.12
33408
16
0
diff --git a/NetStream/source/menus/menu_player_youtube.cpp b/NetStream/source/menus/menu_player_youtube.cpp
index b53efc9..3f4b847 100644
--- a/NetStream/source/menus/menu_player_youtube.cpp
+++ b/NetStream/source/menus/menu_player_youtube.cpp
@@ -74,7 +74,7 @@ void menu::PlayerYoutube::LoadJob::Run()
char *hls = new char[SCE_KERNEL_1KiB];
hls[0] = 0;
settings->GetInt("yt_hls_quality", (int32_t *)&quality, 0);
- ret = invGetHlsUrl(workObj->videoId.c_str(), (InvHlsQuality)quality, hls, SCE_KERNEL_1KiB);
+ ret = invGetHlsUrl(invItem, (InvHlsQuality)quality, hls, SCE_KERNEL_1KiB);
if (ret != SCE_OK)
{
if (quality == 0)
@@ -85,7 +85,7 @@ void menu::PlayerYoutube::LoadJob::Run()
{
quality--;
}
- invGetHlsUrl(workObj->videoId.c_str(), (InvHlsQuality)quality, hls, SCE_KERNEL_1KiB);
+ invGetHlsUrl(invItem, (InvHlsQuality)quality, hls, SCE_KERNEL_1KiB);
}
workObj->videoLink = hls;
workObj->isHls = true;
@@ -110,9 +110,9 @@ void menu::PlayerYoutube::LoadJob::Run()
char lastResortAudio[256];
lastResort[0] = 0;
lastResortAudio[0] = 0;
- ret = invGetProxyUrl(workObj->videoId.c_str(), (InvProxyType)quality, lastResort, sizeof(lastResort));
+ ret = invGetProxyUrl(invItem, (InvProxyType)quality, lastResort, sizeof(lastResort));
workObj->videoLink = lastResort;
- invGetProxyUrl(workObj->videoId.c_str(), INV_PROXY_AUDIO_HQ, lastResortAudio, sizeof(lastResortAudio));
+ invGetProxyUrl(invItem, INV_PROXY_AUDIO_HQ, lastResortAudio, sizeof(lastResortAudio));
workObj->audioLink = lastResortAudio;
}
else
@@ -678,6 +678,9 @@ void menu::PlayerYoutube::PlayerEventCbFun(int32_t type, ui::Handler *self, ui::
common::transition::DoReverse(0.0f, loaderPlane, common::transition::Type_Fadein1, true, false);
workObj->EnableInput();
+ workObj->favButton->Disable(false);
+ workObj->expandButton->Disable(false);
+
dialog::OpenError(g_appPlugin, SCE_ERROR_ERRNO_EUNSUP, Framework::Instance()->GetCommonString("msg_error_connect_server_peer"));
}
else
@@ -751,9 +754,9 @@ menu::PlayerYoutube::PlayerYoutube(const char *id, bool isFavourite) :
stat0 = (ui::Text *)root->FindChild(text_video_stat_0);
stat1 = (ui::Text *)root->FindChild(text_video_stat_1);
stat2 = (ui::Text *)root->FindChild(text_video_stat_2);
- expandButton = root->FindChild(button_youtube_expand);
+ expandButton = (ui::Button *)root->FindChild(button_youtube_expand);
expandButton->AddEventCallback(ui::Button::CB_BTN_DECIDE, ExpandButtonCbFun, this);
- favButton = root->FindChild(button_youtube_fav);
+ favButton = (ui::Button *)root->FindChild(button_youtube_fav);
favButton->AddEventCallback(ui::Button::CB_BTN_DECIDE,FavButtonCbFun);
if (isFav)
{
diff --git a/NetStream/source/menus/menu_settings.cpp b/NetStream/source/menus/menu_settings.cpp
index 19be31f..cfc9577 100644
--- a/NetStream/source/menus/menu_settings.cpp
+++ b/NetStream/source/menus/menu_settings.cpp
@@ -74,7 +74,7 @@ void menu::Settings::Init()
*verinfo = L"RELEASE ";
#endif
*verinfo += WIDE(__DATE__);
- *verinfo += L" v 3.11";
+ *verinfo += L" v 3.12";
s_verinfo = (wchar_t *)verinfo->c_str();
}