Merge pull request #23 from AlwinEsch/Matrix-change

[Matrix] cleanup and change settings.xml to new style

FindOpenGLES.cmake

@@ -1,9 +1,9 @@
 #.rst:
 # FindOpenGLES
 # ------------
-# Finds the OpenGLES2 library
+# Finds the OpenGLES2 and OpenGLES3 library
 #
-# This will define the following variables::
+# This will define the following variables:
 #
 # OPENGLES_FOUND - system has OpenGLES
 # OPENGLES_INCLUDE_DIRS - the OpenGLES include directory
@@ -18,7 +18,8 @@ if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET)
 endif()
 
-if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded AND NOT CORE_SYSTEM_NAME STREQUAL ios)
+if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded AND
+   NOT CORE_SYSTEM_NAME STREQUAL ios)
   find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h
                                  PATHS ${PC_OPENGLES_INCLUDEDIR})
   find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2

screensaver.stars/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="screensaver.stars"
-  version="2.2.0"
+  version="2.2.1"
   name="Stars"
   provider-name="Team Kodi">
   <requires>@ADDON_DEPENDS@</requires>
@@ -12,6 +12,8 @@
     <summary>Stars screensaver</summary>
     <description>A screensaver that lets you fly through the stars.</description>
     <platform>@PLATFORM@</platform>
+    <license>GPL-2.0</license>
+    <source>https://github.com/xbmc/visualization.stars</source>
     <assets>
       <icon>resources/icon.png</icon>
       <fanart>resources/fanart.png</fanart>

screensaver.stars/resources/settings.xml

@@ -1,8 +1,64 @@
-<settings>
-  <setting id="numstars"   label="30000" type="slider" option="int" range="1000,1000,20000" default="8000"/>
-  <setting id="gamma"      label="30001" type="slider" option="float" range="0.01,0.01,2.0" default="1.0"/>
-  <setting id="brightness" label="30002" type="slider" option="float" range="0.01,0.01,1.0" default="0.2"/>
-  <setting id="speed"      label="30003" type="slider" option="float" range="1,0.1,50" default="20.0"/>
-  <setting id="zoom"       label="30004" type="slider" option="float" range="0.1,0.1,10.0" default="1.0"/>
-  <setting id="expanse"    label="30005" type="slider" option="float" range="0.1,0.1,10.0" default="1.5"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<settings version="1">
+  <section id="addon" label="0" help="0">
+    <category id="main" label="128" help="0">
+      <group id="1" label="0">
+        <setting id="numstars" type="integer" label="30000" help="0">
+          <default>8000</default>
+          <constraints>
+            <minimum>1000</minimum>
+            <step>1000</step>
+            <maximum>20000</maximum>
+          </constraints>
+          <control type="slider" format="integer"/>
+        </setting>
+        <setting id="gamma" type="number" label="30001" help="0">
+          <default>1.0</default>
+          <constraints>
+            <minimum>0.01</minimum>
+            <step>0.01</step>
+            <maximum>2.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+        <setting id="brightness" type="number" label="30002" help="0">
+          <default>0.2</default>
+          <constraints>
+            <minimum>0.01</minimum>
+            <step>0.01</step>
+            <maximum>1.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+        <setting id="speed" type="number" label="30003" help="0">
+          <default>20.0</default>
+          <constraints>
+            <minimum>1.0</minimum>
+            <step>0.1</step>
+            <maximum>50.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+        <setting id="zoom" type="number" label="30004" help="0">
+          <default>1.0</default>
+          <constraints>
+            <minimum>0.1</minimum>
+            <step>0.1</step>
+            <maximum>10.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+        <setting id="expanse" type="number" label="30005" help="0">
+          <default>1.5</default>
+          <constraints>
+            <minimum>0.1</minimum>
+            <step>0.1</step>
+            <maximum>10.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+      </group>
+    </category>
+  </section>
 </settings>
+

src/Stars.cpp

@@ -48,9 +48,9 @@ class ATTRIBUTE_HIDDEN CScreensaverStars
 public:
   CScreensaverStars();
 
-  virtual bool Start() override;
-  virtual void Stop() override;
-  virtual void Render() override;
+  bool Start() override;
+  void Stop() override;
+  void Render() override;
 
 private:
   ST_SETTINGS m_Settings;