- Implement inputstream ffmpegdirect

- Improve debug & error handling
nirvana-7777 · Nov 8, 2023 · 3d6259c · 3d6259c
1 parent 96d424e
commit 3d6259c
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 223 deletions.
diff --git a/pvr.eon/addon.xml.in b/pvr.eon/addon.xml.in
@@ -6,7 +6,8 @@
   provider-name="Nirvana">
   <requires>
     @ADDON_DEPENDS@
-    <import addon="inputstream.adaptive" minversion="2.4.2"/>
+    <import addon="inputstream.ffmpegdirect" minversion="20.0.0"/>
+    <import addon="inputstream.adaptive" minversion="20.0.0"/>
     <import addon="script.module.inputstreamhelper" version="0.5.8"/>
   </requires>
   <extension point="kodi.pvrclient" library_@PLATFORM@="@LIBRARY_FILENAME@"/>

diff --git a/pvr.eon/changelog.txt b/pvr.eon/changelog.txt
@@ -9,7 +9,7 @@ v20.6.1
   - Switch from adaptive to manual-osd for inputstream
   - Fix not subscribed channels leading to crash
 v20.7.0
-  - Add Android TV platform (e.g. BigScreen/4K
+  - Add Android TV platform (e.g. BigScreen/4K)
 v20.7.1
   - Adapt user agent header for platforms when streaming
 v20.7.2

diff --git a/pvr.eon/resources/language/resource.language.de_de/strings.po b/pvr.eon/resources/language/resource.language.de_de/strings.po
@@ -231,3 +231,15 @@ msgstr "inputstream.adaptive"
 msgctxt "#30053"
 msgid "inputstream.ffmpegdirect"
 msgstr "inputstream.ffmpegdirect"
+
+msgctxt "#30500"
+msgid "Inputstream error"
+msgstr "Inputstream Fehler"
+
+msgctxt "#30501"
+msgid "The %s addon is not installed."
+msgstr "Das %s Addon ist nicht installiert"
+
+msgctxt "#30502"
+msgid "The %s addon is not enabled."
+msgstr "Das %s Addon ist nicht aktiviert"
diff --git a/pvr.eon/resources/language/resource.language.en_gb/strings.po b/pvr.eon/resources/language/resource.language.en_gb/strings.po
@@ -219,3 +219,15 @@ msgstr ""
 msgctxt "#30053"
 msgid "inputstream.ffmpegdirect"
 msgstr ""
+
+msgctxt "#30500"
+msgid "Inputstream error"
+msgstr ""
+
+msgctxt "#30501"
+msgid "The %s addon is not installed."
+msgstr ""
+
+msgctxt "#30502"
+msgid "The %s addon is not enabled."
+msgstr ""
diff --git a/pvr.eon/resources/language/resource.language.en_us/strings.po b/pvr.eon/resources/language/resource.language.en_us/strings.po
@@ -223,3 +223,15 @@ msgstr ""
 msgctxt "#30053"
 msgid "inputstream.ffmpegdirect"
 msgstr ""
+
+msgctxt "#30500"
+msgid "Inputstream error"
+msgstr ""
+
+msgctxt "#30501"
+msgid "The %s addon is not installed."
+msgstr ""
+
+msgctxt "#30502"
+msgid "The %s addon is not enabled."
+msgstr ""
diff --git a/src/Globals.h b/src/Globals.h
@@ -22,37 +22,10 @@ static const std::string CLIENT_SECRET_WEB = "1w4dmww87x1e9l89essqvc81pidrqsa0li
 static const std::string CLIENT_ID_ATV = "5a3e24b8-70cd-4958-b716-af9ce053e594";
 static const std::string CLIENT_SECRET_ATV = "aazy6orsi9elhhs17e47lfb4palgszw6igf4y26z";
 
-static const std::string SS_PORTAL = "https://mojtelemach.ba";
 static const std::string SS_DOMAIN = "TBA";
 static const std::string SS_USER = "webscuser";
 static const std::string SS_SECRET = "k4md93!k334f3";
 static const std::string SS_PASS = "xD8iMq1!m94z";
-//Web Client
-static const std::string API_PREFIX_WEB = "web";
-static const std::string API_SELECTOR_WEB = "be";
-static const std::string DEVICE_TYPE_WEB = "web_linux_chrome";
-static const std::string DEVICE_NAME_WEB = "";
-static const std::string DEVICE_MODEL_WEB = "Chrome 116";
-static const std::string DEVICE_PLATFORM_WEB = "web";
-static const std::string DEVICE_MAC_WEB = "";
-static const std::string CLIENT_SW_VERSION_WEB = "";
-static const std::string CLIENT_SW_BUILD_WEB = "";
-static const std::string SYSTEM_SW_WEB = "Linux";
-static const std::string SYSTEM_VERSION_WEB = "x86_64";
-static const std::string USER_AGENT_WEB = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36";
-//Android TV
-static const std::string API_PREFIX_ATV = "android-tv";
-static const std::string API_SELECTOR_ATV = "af31";
-static const std::string DEVICE_TYPE_ATV = "Android 11";
-static const std::string DEVICE_NAME_ATV = "Android TV 30";
-static const std::string DEVICE_MODEL_ATV = "SHIELD Android TV";
-static const std::string DEVICE_PLATFORM_ATV = "android_tv";
-static const std::string DEVICE_MAC_ATV = "";
-static const std::string CLIENT_SW_VERSION_ATV = "8.1.3";
-static const std::string CLIENT_SW_BUILD_ATV = "8.1.35906";
-static const std::string SYSTEM_SW_ATV = "Android";
-static const std::string SYSTEM_VERSION_ATV = "11";
-static const std::string USER_AGENT_ATV = "Mozilla/5.0 (Linux; Android 11; SHIELD Android TV Build/RQ1A.210105.003; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.196 Mobile Safari/537.36; XDKAndroidWebView/3.0.1/XDKWebView NVIDIA NVIDIA/mdarcy/mdarcy:11/RQ1A.210105.003/7825230_3167.5736:user/release-keys NVIDIA AndroidTV 1.00A_ATV SHIELD Android TV Android/11 ExoPlayer ((1.00A_ATV::1.14.1::androidtv::)";
 //LG TV
 //static const std::string DEVICE_TYPE = "lgw-z81-8jg";
 //static const std::string DEVICE_NAME = "LG WEB OS 2020";