Merge pull request #203 from mglae/omega_admin_gles

[Omega] Fix Admin window on GLES / Warn if skin is not supported
kodi-pvr · Mar 20, 2023 · bd0c61e · bd0c61e
2 parents db58452 + e76c771
commit bd0c61e
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 2 deletions.
diff --git a/pvr.vdr.vnsi/addon.xml.in b/pvr.vdr.vnsi/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vdr.vnsi"
-  version="21.0.0"
+  version="21.0.1"
   name="VDR VNSI Client"
   provider-name="Team Kodi, FernetMenta">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.vdr.vnsi/changelog.txt b/pvr.vdr.vnsi/changelog.txt
@@ -1,3 +1,9 @@
+v21.0.1
+- Fix display of "Client Specific Settings" on GLES
+
+v21.0.0
+- Increased version to 21.0.0 for Kodi 21 Omega
+
 v20.4.0
 - Kodi inputstream API update to version 3.2.0
 - Kodi PVR API update to version 8.0.2

diff --git a/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po b/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po
@@ -319,3 +319,13 @@ msgstr ""
 msgctxt "#30205"
 msgid "Repeating Child"
 msgstr ""
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr ""
+
+#empty strings from id 30206 to 30299
+
+msgctxt "#30300"
+msgid "The Skin is not supported"
+msgstr ""
diff --git a/pvr.vdr.vnsi/resources/shaders/GLES/vert.glsl b/pvr.vdr.vnsi/resources/shaders/GLES/vert.glsl
@@ -5,6 +5,9 @@ attribute vec2 a_coord;
 
 varying vec2 v_coord;
 
+uniform mat4 m_proj;
+uniform mat4 m_model;
+
 void main()
 {
   mat4 mvp = m_proj * m_model;

diff --git a/src/GUIWindowAdmin.cpp b/src/GUIWindowAdmin.cpp
@@ -14,6 +14,7 @@
 
 #include <kodi/General.h>
 #include <kodi/Network.h>
+#include <kodi/gui/dialogs/OK.h>
 #include <kodi/gui/gl/GL.h>
 #include <kodi/gui/gl/Shader.h>
 #include <queue>
@@ -563,14 +564,21 @@ bool cVNSIAdmin::Open(const std::string& hostname,
   m_port = port;
   m_wolMac = mac;
 
+  if (nullptr == GetControlHandle())
+  {
+    kodi::gui::dialogs::OK::ShowAndGetInput(
+        "pvr.vdr.vnsi", kodi::addon::GetLocalizedString(30300, "The Skin is not supported"));
+    return false;
+  }
+
   if (!cVNSISession::Open(m_hostname, m_port, name))
     return false;
 
   if (!cVNSISession::Login())
     return false;
 
   m_bIsOsdControl = false;
-#if defined(HAS_GL) || defined(HAS_GLES2)
+#if defined(HAS_GL) || defined(HAS_GLES)
   m_osdRender = new cOSDRenderGL();
 #else
   m_osdRender = new cOSDRender();