Update

AlwinEsch · Feb 12, 2022 · 8057cf4 · 8057cf4
1 parent ef74a7c
commit 8057cf4
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 434 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -3661,18 +3661,20 @@ void CApplication::ActivateScreenSaver(bool forceType /*= false */)
       m_screensaverIdInUse = "screensaver.xbmc.builtin.dim";
   }
 
+  ADDON::AddonPtr screenSaver;
   if (m_screensaverIdInUse == "screensaver.xbmc.builtin.dim" ||
       m_screensaverIdInUse == "screensaver.xbmc.builtin.black" ||
       m_screensaverIdInUse.empty())
   {
     return;
   }
-  else if (CServiceBroker::GetAddonMgr().GetAddon(m_screensaverIdInUse, m_pythonScreenSaver,
+  else if (CServiceBroker::GetAddonMgr().GetAddon(m_screensaverIdInUse, screenSaver,
                                                   ADDON_SCREENSAVER, OnlyEnabled::CHOICE_YES))
   {
-    std::string libPath = m_pythonScreenSaver->LibPath();
+    std::string libPath = screenSaver->LibPath();
     if (CScriptInvocationManager::GetInstance().HasLanguageInvoker(libPath))
     {
+      m_pythonScreenSaver = screenSaver;
       CLog::Log(LOGDEBUG, "using python screensaver add-on {}", m_screensaverIdInUse);
 
       // Don't allow a previously-scheduled alarm to kill our new screensaver

diff --git a/xbmc/addons/interface/renderer/CMakeLists.txt b/xbmc/addons/interface/renderer/CMakeLists.txt
@@ -2,12 +2,10 @@
 # See xbmc/addons/kodi-dev-kit/tools/code-generator.py.
 
 set(SOURCES
-  GLShader.cpp
   GLViewRenderer.cpp
 )
 
 set(HEADERS
-  GLShader.h
   GLViewRenderer.h
   IRenderHelper.h
 )

diff --git a/xbmc/addons/interface/renderer/GLShader.cpp b/xbmc/addons/interface/renderer/GLShader.cpp