Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Omega] Fix Admin window on GLES / Warn if skin is not supported #203

Merged
merged 3 commits into from
Mar 20, 2023
Merged

[Omega] Fix Admin window on GLES / Warn if skin is not supported #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
223d914
GLES: fix failing Admin window
mglae Mar 19, 2023
4b2e317
GUIWindowAdmin: "Skin not supported" dialog
mglae Mar 19, 2023
e76c771
Increase version to 21.0.1
mglae Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pvr.vdr.vnsi/addon.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 6 additions & 0 deletions pvr.vdr.vnsi/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 10 additions & 0 deletions pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
3 changes: 3 additions & 0 deletions pvr.vdr.vnsi/resources/shaders/GLES/vert.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 9 additions & 1 deletion src/GUIWindowAdmin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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();
Expand Down