The branch, frodo has been updated
via 2848ba63f4e06ca12e00e7613e5bc5f88e157bd9 (commit)
from de69936ee8bccaf773d4e463f4d55d4c8de86a2b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=2848ba63f4e06ca12e00e7613e5bc5f88e157bd9
commit 2848ba63f4e06ca12e00e7613e5bc5f88e157bd9
Author: Martijn Kaijser <[email protected]>
Date: Mon Jan 13 08:39:13 2014 +0100
[script.xbmc.boblight] 2.0.6
diff --git a/script.xbmc.boblight/addon.xml b/script.xbmc.boblight/addon.xml
index 95ac92a..c78fe9c 100644
--- a/script.xbmc.boblight/addon.xml
+++ b/script.xbmc.boblight/addon.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.xbmc.boblight" name="XBMC Boblight" version="2.0.5"
provider-name="bobo1on1|Memphiz">
+<addon id="script.xbmc.boblight" name="XBMC Boblight" version="2.0.6"
provider-name="bobo1on1, Memphiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
<extension point="xbmc.service" library="default.py"
start="login"></extension>
<extension point="xbmc.addon.metadata">
- <summary lang="en">XBMC output to boblight.</summary>
- <description lang="en">XBMC output to boblight
http://code.google.com/p/boblight/</description>
+ <summary lang="en">Connect XBMC output to boblight.</summary>
+ <description lang="en">Connect XBMC output to boblight
backend.</description>
+ <disclaimer lang="en">You need to have the correct binary addon installed
for this to work.</disclaimer>
<platform>all</platform>
<website>http://code.google.com/p/boblight/</website>
<source>https://github.com/bobo1on1/script.xbmc.boblight</source>
diff --git a/script.xbmc.boblight/changelog.txt
b/script.xbmc.boblight/changelog.txt
index 6b11bf9..e015df3 100644
--- a/script.xbmc.boblight/changelog.txt
+++ b/script.xbmc.boblight/changelog.txt
@@ -1,8 +1,16 @@
+2.0.6
+- [changed] use correct string ID range
+- [language] added dutch translations - thx to georgehenze
+- [feature] added a new preset categories used for tvshows, livetv and files
(everything outside of the movie database)
+- [feature] for all categories there is a new preset "disabled" which
basically disables boblight. This allows to
+ watch live-tv without boblight and movies with - without needing to change
the addon settings - thx to georgehenze for
+ those 2 features
+
2.0.5
- [fix] recover if boblightd is disconnected while movie is playing - by amet
2.0.4
-- [fix] - race condition which could lead to boblight turn on after movie
stop if static light is not enabled
+- [fix] - race condition which could lead to boblight turn on after movie stop
if static light is not enabled
2.0.3
- [add] - option for disabling/enabling the initial color blink
diff --git a/script.xbmc.boblight/default.py b/script.xbmc.boblight/default.py
index d069896..005734a 100644
--- a/script.xbmc.boblight/default.py
+++ b/script.xbmc.boblight/default.py
@@ -98,7 +98,7 @@ class Main():
if not ret:
log("connection to boblightd failed: %s" % bob.bob_geterror())
- text = __language__(500)
+ text = __language__(32500)
if self.warning < 3 and settings.other_misc_notifications:
xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
self.warning += 1
@@ -109,7 +109,7 @@ class Main():
else:
self.warning = 0
if settings.other_misc_notifications:
- text = __language__(501)
+ text = __language__(32501)
xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
log("connected to boblightd")
bob.bob_set_priority(128)
@@ -122,22 +122,22 @@ class Main():
if loaded == 1: #libboblight not found
if platform == 'linux':
- t1 = __language__(504)
- t2 = __language__(505)
- t3 = __language__(506)
+ t1 = __language__(32504)
+ t2 = __language__(32505)
+ t3 = __language__(32506)
xbmcgui.Dialog().ok(__scriptname__,t1,t2,t3)
else: # ask user if we should
fetch the
- t1 = __language__(504) # lib for osx, ios and
windows
- t2 = __language__(509)
+ t1 = __language__(32504) # lib for osx, ios and
windows
+ t2 = __language__(32509)
if xbmcgui.Dialog().yesno(__scriptname__,t1,t2):
tools_downloadLibBoblight(platform,settings.other_misc_notifications)
loaded = bob.bob_loadLibBoblight(libpath,platform)
elif loaded == 2: #no ctypes available
- t1 = __language__(507)
- t2 = __language__(508)
+ t1 = __language__(32507)
+ t2 = __language__(32508)
xbmcgui.Dialog().ok(__scriptname__,t1,t2)
return loaded
@@ -155,8 +155,15 @@ def myPlayerChanged(state):
if state == 'stop':
ret = "static"
else:
+ # Possible Videoplayer options: files, movies, episodes, musicvideos,
livetv
if xbmc.getCondVisibility("VideoPlayer.Content(musicvideos)"):
ret = "musicvideo"
+ elif xbmc.getCondVisibility("VideoPlayer.Content(episodes)"):
+ ret = "tvshow"
+ elif xbmc.getCondVisibility("VideoPlayer.Content(livetv)"):
+ ret = "livetv"
+ elif xbmc.getCondVisibility("VideoPlayer.Content(files)"):
+ ret = "files"
elif xbmc.getCondVisibility("Player.HasAudio()"):
ret = "static"
else:
diff --git a/script.xbmc.boblight/resources/language/English/strings.xml
b/script.xbmc.boblight/resources/language/English/strings.xml
index cecfc76..6191451 100644
--- a/script.xbmc.boblight/resources/language/English/strings.xml
+++ b/script.xbmc.boblight/resources/language/English/strings.xml
@@ -5,57 +5,84 @@
<!--Settings-->
<!--General-->
- <string id="100">General</string>
- <string id="101">Use remote boblightd</string>
- <string id="102">Boblightd IP</string>
- <string id="103">Boblightd Port</string>
- <string id="104">Disable boblight</string>
- <string id="105">Override used category</string>
- <string id="106">Category</string>
+ <string id="32100">General</string>
+ <string id="32101">Use remote boblightd</string>
+ <string id="32102">Boblightd IP</string>
+ <string id="32103">Boblightd Port</string>
+ <string id="32104">Disable boblight</string>
+ <string id="32105">Override used category</string>
+ <string id="32106">Category</string>
<!--Movie/MusicVideo/Other-->
- <string id="200">Movie</string>
- <string id="201">Preset</string>
- <string id="202">Speed</string>
- <string id="203">Autospeed</string>
- <string id="204">Interpolation</string>
- <string id="205">Saturation</string>
- <string id="206">Value</string>
- <string id="207">Threshold</string>
-
- <string id="220">Custom</string>
- <string id="221">Slow</string>
- <string id="222">Fast</string>
+ <string id="32200">Movie</string>
+ <string id="32201">Preset</string>
+ <string id="32202">Speed</string>
+ <string id="32203">Autospeed</string>
+ <string id="32204">Interpolation</string>
+ <string id="32205">Saturation</string>
+ <string id="32206">Value</string>
+ <string id="32207">Threshold</string>
+
+ <string id="32220">Custom</string>
+ <string id="32221">Slow</string>
+ <string id="32222">Fast</string>
+ <string id="32223">Disabled</string>
<!--MusicVideo-->
- <string id="300">Musicvideo</string>
+ <string id="32300">Musicvideo</string>
- <string id="320">Custom</string>
- <string id="321">Slow</string>
- <string id="322">Fast</string>
+ <string id="32320">Custom</string>
+ <string id="32321">Slow</string>
+ <string id="32322">Fast</string>
+ <string id="32323">Disabled</string>
<!--Other-->
- <string id="400">Other</string>
- <string id="401">Static background light</string>
- <string id="402">Red</string>
- <string id="403">Green</string>
- <string id="404">Blue</string>
- <string id="405">Disable when Screen Saver is on</string>
- <string id="406">Enable initial light flash</string>
- <string id="407">Enable status notifications</string>
+ <string id="32400">Other</string>
+ <string id="32401">Static background light</string>
+ <string id="32402">Red</string>
+ <string id="32403">Green</string>
+ <string id="32404">Blue</string>
+ <string id="32405">Disable when Screen Saver is on</string>
+ <string id="32406">Enable initial light flash</string>
+ <string id="32407">Enable status notifications</string>
<!--Notifications-->
- <string id="500">Failed to connect to boblightd!</string>
- <string id="501">Connected to boblightd!</string>
- <string id="502">Settings changed!</string>
- <string id="503">Boblight is disabled!</string>
- <string id="504">This addon needs a binary library.</string>
- <string id="505">Please read the README file.</string>
- <string id="506">for getting some more instructions.</string>
- <string id="507">This addon can't be run on that</string>
- <string id="508">operating system! (missing ctypes module)</string>
- <string id="509">Should the addon try to download it for you?</string>
- <string id="510">Error downloading. Check filesystem permissions.</string>
+ <string id="32500">Failed to connect to boblightd!</string>
+ <string id="32501">Connected to boblightd!</string>
+ <string id="32502">Settings changed!</string>
+ <string id="32503">Boblight is disabled!</string>
+ <string id="32504">This addon needs a binary library.</string>
+ <string id="32505">Please read the README file.</string>
+ <string id="32506">for getting some more instructions.</string>
+ <string id="32507">This addon can't be run on that</string>
+ <string id="32508">operating system! (missing ctypes module)</string>
+ <string id="32509">Should the addon try to download it for you?</string>
+ <string id="32510">Error downloading. Check filesystem permissions.</string>
+
+ <!--TVShows-->
+ <string id="32600">TV Shows</string>
+
+ <string id="32620">Custom</string>
+ <string id="32621">Slow</string>
+ <string id="32622">Fast</string>
+ <string id="32623">Disabled</string>
+
+ <!--LiveTV-->
+ <string id="32700">LiveTV</string>
+
+ <string id="32720">Custom</string>
+ <string id="32721">Slow</string>
+ <string id="32722">Fast</string>
+ <string id="32723">Disabled</string>
+
+ <!--Files-->
+ <string id="32800">Files</string>
+
+ <string id="32820">Custom</string>
+ <string id="32821">Slow</string>
+ <string id="32822">Fast</string>
+ <string id="32823">Disabled</string>
+
</strings>
diff --git a/script.xbmc.boblight/resources/language/German/strings.xml
b/script.xbmc.boblight/resources/language/German/strings.xml
index 456062b..2fa43a4 100644
--- a/script.xbmc.boblight/resources/language/German/strings.xml
+++ b/script.xbmc.boblight/resources/language/German/strings.xml
@@ -5,55 +5,82 @@
<!--Settings-->
<!--General-->
- <string id="100">Allgemein</string>
- <string id="101">Benutze boblight über Netzwerk</string>
- <string id="102">Boblightd IP</string>
- <string id="103">Boblightd Port</string>
- <string id="104">Boblight ausschalten</string>
- <string id="105">Erzwinge Kategorie</string>
- <string id="106">Kategorie</string>
+ <string id="32100">Allgemein</string>
+ <string id="32101">Benutze boblight über Netzwerk</string>
+ <string id="32102">Boblightd IP</string>
+ <string id="32103">Boblightd Port</string>
+ <string id="32104">Boblight ausschalten</string>
+ <string id="32105">Erzwinge Kategorie</string>
+ <string id="32106">Kategorie</string>
<!--Movie/MusicVideo/Other-->
- <string id="200">Film</string>
- <string id="201">Preset</string>
- <string id="202">Geschwindigkeit</string>
- <string id="203">autom. Geschwindigkeit</string>
- <string id="204">Interpolation</string>
- <string id="205">Farbe</string>
- <string id="206">Wert</string>
- <string id="207">Schwellwert</string>
-
- <string id="220">Eigene</string>
- <string id="221">langsam</string>
- <string id="222">schnell</string>
+ <string id="32200">Film</string>
+ <string id="32201">Preset</string>
+ <string id="32202">Geschwindigkeit</string>
+ <string id="32203">Autom. Geschwindigkeit</string>
+ <string id="32204">Interpolation</string>
+ <string id="32205">Farbe</string>
+ <string id="32206">Wert</string>
+ <string id="32207">Schwellwert</string>
+
+ <string id="32220">Eigene</string>
+ <string id="32221">Langsam</string>
+ <string id="32222">Schnell</string>
+ <string id="32223">Ausschalten</string>
<!--MusicVideo-->
- <string id="300">Musikvideo</string>
+ <string id="32300">Musikvideo</string>
- <string id="320">Eigene</string>
- <string id="321">langsam</string>
- <string id="322">schnell</string>
+ <string id="32320">Eigene</string>
+ <string id="32321">Langsam</string>
+ <string id="32322">Schnell</string>
+ <string id="32323">Ausschalten</string>
<!--Other-->
- <string id="400">Sonstige</string>
- <string id="401">Festes Hintergrundlicht</string>
- <string id="402">Rot</string>
- <string id="403">Gruen</string>
- <string id="404">Blau</string>
- <string id="405">Waehrend Bildschirmschoner Licht ausschalten</string>
- <string id="406">Initialen Lichttest aktivieren</string>
- <string id="407">Statusnachrichten aktivieren</string>
+ <string id="32400">Sonstige</string>
+ <string id="32401">Festes Hintergrundlicht</string>
+ <string id="32402">Rot</string>
+ <string id="32403">Gruen</string>
+ <string id="32404">Blau</string>
+ <string id="32405">Waehrend Bildschirmschoner Licht ausschalten</string>
+ <string id="32406">Initialen Lichttest aktivieren</string>
+ <string id="32407">Statusnachrichten aktivieren</string>
<!--Notifications-->
- <string id="500">Fehler beim Verbinden zu boblightd!</string>
- <string id="501">Verbunden mit boblightd!</string>
- <string id="502">Einstellungen geaendert!</string>
- <string id="503">Boblight wurde ausgeschaltet!</string>
- <string id="504">Dieses Addon benoetigt eine binaere Bibliothek.</string>
- <string id="505">Bitte lesen Sie die README Datei.</string>
- <string id="506">fuer weitere Hilfe.</string>
- <string id="507">Dieses Addon kann auf Ihrem Betriebssystem nicht</string>
- <string id="508">ausgefuehrt werden! (Das ctypes Modul fehlt)</string>
- <string id="509">Soll versucht werden diese automatisch
herunterzuladen?</string>
- <string id="510">Fehler beim Herunterladen. Dateisystemberechtigungen
pruefen.</string>
+ <string id="32500">Fehler beim Verbinden zu boblightd!</string>
+ <string id="32501">Verbunden mit boblightd!</string>
+ <string id="32502">Einstellungen geaendert!</string>
+ <string id="32503">Boblight wurde ausgeschaltet!</string>
+ <string id="32504">Dieses Addon benoetigt eine binaere Bibliothek.</string>
+ <string id="32505">Bitte lesen Sie die README Datei.</string>
+ <string id="32506">fuer weitere Hilfe.</string>
+ <string id="32507">Dieses Addon kann auf Ihrem Betriebssystem nicht</string>
+ <string id="32508">ausgefuehrt werden! (Das ctypes Modul fehlt)</string>
+ <string id="32509">Soll versucht werden diese automatisch
herunterzuladen?</string>
+ <string id="32510">Fehler beim Herunterladen. Dateisystemberechtigungen
pruefen.</string>
+
+ <!--TVShows-->
+ <string id="32600">TV-Serien</string>
+
+ <string id="32620">Eigene</string>
+ <string id="32621">Langsam</string>
+ <string id="32622">Schnell</string>
+ <string id="32623">Ausschalten</string>
+
+ <!--LiveTV-->
+ <string id="32700">LiveTV</string>
+
+ <string id="32720">Eigene</string>
+ <string id="32721">Langsam</string>
+ <string id="32722">Schnell</string>
+ <string id="32723">Ausschalten</string>
+
+ <!--Files-->
+ <string id="32800">Files</string>
+
+ <string id="32820">Eigene</string>
+ <string id="32821">Langsam</string>
+ <string id="32822">Schnell</string>
+ <string id="32823">Ausschalten</string>
+
</strings>
diff --git a/script.xbmc.boblight/resources/lib/settings.py
b/script.xbmc.boblight/resources/lib/settings.py
index 724e99c..605d51f 100644
--- a/script.xbmc.boblight/resources/lib/settings.py
+++ b/script.xbmc.boblight/resources/lib/settings.py
@@ -90,7 +90,34 @@ class settings():
self.movie_interpolation =
int(__addon__.getSetting("movie_interpolation") == "true")
self.movie_threshold =
float(__addon__.getSetting("movie_threshold"))
self.movie_preset = int(__addon__.getSetting("movie_preset"))
-
+
+ # TV Shows settings
+ self.tvshow_saturation =
float(__addon__.getSetting("tvshow_saturation"))
+ self.tvshow_value =
float(__addon__.getSetting("tvshow_value"))
+ self.tvshow_speed =
float(__addon__.getSetting("tvshow_speed"))
+ self.tvshow_autospeed =
float(__addon__.getSetting("tvshow_autospeed"))
+ self.tvshow_interpolation =
int(__addon__.getSetting("tvshow_interpolation") == "true")
+ self.tvshow_threshold =
float(__addon__.getSetting("tvshow_threshold"))
+ self.tvshow_preset =
int(__addon__.getSetting("tvshow_preset"))
+
+ # LiveTV settings
+ self.livetv_saturation =
float(__addon__.getSetting("livetv_saturation"))
+ self.livetv_value =
float(__addon__.getSetting("livetv_value"))
+ self.livetv_speed =
float(__addon__.getSetting("livetv_speed"))
+ self.livetv_autospeed =
float(__addon__.getSetting("livetv_autospeed"))
+ self.livetv_interpolation =
int(__addon__.getSetting("livetv_interpolation") == "true")
+ self.livetv_threshold =
float(__addon__.getSetting("livetv_threshold"))
+ self.livetv_preset =
int(__addon__.getSetting("livetv_preset"))
+
+ # Files settings
+ self.files_saturation =
float(__addon__.getSetting("files_saturation"))
+ self.files_value =
float(__addon__.getSetting("files_value"))
+ self.files_speed =
float(__addon__.getSetting("files_speed"))
+ self.files_autospeed =
float(__addon__.getSetting("files_autospeed"))
+ self.files_interpolation =
int(__addon__.getSetting("files_interpolation") == "true")
+ self.files_threshold =
float(__addon__.getSetting("files_threshold"))
+ self.files_preset = int(__addon__.getSetting("files_preset"))
+
# Music Video settings
self.music_saturation =
float(__addon__.getSetting("musicvideo_saturation"))
self.music_value =
float(__addon__.getSetting("musicvideo_value"))
@@ -119,6 +146,13 @@ class settings():
autospeed = 0.0
interpolation = 0
threshold = 0.0
+ elif self.movie_preset == 3: #preset disabled
+ saturation = 0.0
+ value = 0.0
+ speed = 0.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
elif self.movie_preset == 0: #custom
saturation = self.movie_saturation
value = self.movie_value
@@ -127,7 +161,112 @@ class settings():
interpolation = self.movie_interpolation
threshold = self.movie_threshold
return (saturation,value,speed,autospeed,interpolation,threshold)
+
+ #handle boblight configuration from the "TVShows" category
+ #returns the new settings
+ def setupForTVShow(self):
+ log('settings() - setupForTVShow')
+
+ if self.tvshow_preset == 1: #preset smooth
+ saturation = 3.0
+ value = 10.0
+ speed = 20.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.tvshow_preset == 2: #preset action
+ saturation = 3.0
+ value = 10.0
+ speed = 80.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.tvshow_preset == 3: #preset disabled
+ saturation = 0.0
+ value = 0.0
+ speed = 0.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.tvshow_preset == 0: #custom
+ saturation = self.movie_saturation
+ value = self.movie_value
+ speed = self.movie_speed
+ autospeed = self.movie_autospeed
+ interpolation = self.movie_interpolation
+ threshold = self.movie_threshold
+ return (saturation,value,speed,autospeed,interpolation,threshold)
+
+ #handle boblight configuration from the "LiveTV" category
+ #returns the new settings
+ def setupForLiveTV(self):
+ log('settings() - setupForLiveTV')
+
+ if self.livetv_preset == 1: #preset smooth
+ saturation = 3.0
+ value = 10.0
+ speed = 20.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.livetv_preset == 2: #preset action
+ saturation = 3.0
+ value = 10.0
+ speed = 80.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.livetv_preset == 3: #preset disabled
+ saturation = 0.0
+ value = 0.0
+ speed = 0.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.livetv_preset == 0: #custom
+ saturation = self.livetv_saturation
+ value = self.livetv_value
+ speed = self.livetv_speed
+ autospeed = self.livetv_autospeed
+ interpolation = self.livetv_interpolation
+ threshold = self.livetv_threshold
+ return (saturation,value,speed,autospeed,interpolation,threshold)
+
+ #handle boblight configuration from the "files" category
+ #returns the new settings
+ def setupForFiles(self):
+ log('settings() - setupForFiles')
+ if self.files_preset == 1: #preset smooth
+ saturation = 3.0
+ value = 10.0
+ speed = 20.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.files_preset == 2: #preset action
+ saturation = 3.0
+ value = 10.0
+ speed = 80.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.files_preset == 3: #preset disabled
+ saturation = 0.0
+ value = 0.0
+ speed = 0.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
+ elif self.files_preset == 0: #custom
+ saturation = self.files_saturation
+ value = self.files_value
+ speed = self.files_speed
+ autospeed = self.files_autospeed
+ interpolation = self.files_interpolation
+ threshold = self.files_threshold
+ return (saturation,value,speed,autospeed,interpolation,threshold)
+
#handle boblight configuration from the "MusicVideo" category
#returns the new settings
def setupForMusicVideo(self):
@@ -147,6 +286,13 @@ class settings():
autospeed = 0.0
interpolation = 0
threshold = 0.0
+ elif self.music_preset == 3: #preset disabled
+ saturation = 0.0
+ value = 0.0
+ speed = 0.0
+ autospeed = 0.0
+ interpolation = 0
+ threshold = 0.0
elif self.music_preset == 0: #custom
saturation = self.music_saturation
value = self.music_value
@@ -204,13 +350,16 @@ class settings():
#handles the boblight configuration of all categorys
#and applies changed settings to boblight
- #"movie","musicvideo", "other and "static"
+ #"movie","musicvideo","files","livetv","tvshows","other and "static"
def handleGlobalSettings(self):
log('settings() - handleGlobalSettings')
if (self.current_option != self.category) or self.force_update:
- #call the right setup function according to categroy
+ #call the right setup function according to category
#switch case in python - dictionary with function pointers
option = { "movie" : self.setupForMovie,
+ "tvshow" : self.setupForTVShow,
+ "livetv" : self.setupForLiveTV,
+ "files" : self.setupForFiles,
"musicvideo" : self.setupForMusicVideo,
"other" : self.setupForOther,
"static" : self.setupForStatic,
diff --git a/script.xbmc.boblight/resources/lib/tools.py
b/script.xbmc.boblight/resources/lib/tools.py
index 2ba1a06..6fa5edc 100644
--- a/script.xbmc.boblight/resources/lib/tools.py
+++ b/script.xbmc.boblight/resources/lib/tools.py
@@ -61,7 +61,7 @@ def tools_downloadLibBoblight(platform,allowNotify):
os.remove(dest + ".zip")
except:
if allowNotify:
- text = __language__(510)
+ text = __language__(32510)
xbmc.executebuiltin("XBMC.Notification(%s,%s,%s,%s)" %
(__scriptname__,text,750,__icon__))
def log(msg):
diff --git a/script.xbmc.boblight/resources/settings.xml
b/script.xbmc.boblight/resources/settings.xml
index 702a459..0827244 100644
--- a/script.xbmc.boblight/resources/settings.xml
+++ b/script.xbmc.boblight/resources/settings.xml
@@ -1,48 +1,75 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
- <category label="100">
- <setting id="overwrite_cat" type="bool" label="105" default="false" />
- <setting id="overwrite_cat_val" type="enum" subsetting="true"
enable="eq(-1,true)" label="106" default="0" lvalues="200|300" />
+ <category label="32100">
+ <setting id="overwrite_cat" type="bool" label="32105" default="false" />
+ <setting id="overwrite_cat_val" type="enum" subsetting="true"
enable="eq(-1,true)" label="32106" default="0"
lvalues="32200|32300|32600|32700|32800" />
<setting id="sep1" type="sep" />
- <setting id="networkaccess" type="bool" label="101" default="false" />
- <setting id="hostip" type="ipaddress" subsetting="true"
enable="eq(-1,true)" label="102" default="127.0.0.1" />
- <setting id="hostport" type="number" subsetting="true"
enable="eq(-2,true)" label="103" default="19333" />
+ <setting id="networkaccess" type="bool" label="32101" default="false" />
+ <setting id="hostip" type="ipaddress" subsetting="true"
enable="eq(-1,true)" label="32102" default="127.0.0.1" />
+ <setting id="hostport" type="number" subsetting="true"
enable="eq(-2,true)" label="32103" default="19333" />
<setting id="sep2" type="sep" />
- <setting id="bobdisable" type="bool" label="104" default="false" />
+ <setting id="bobdisable" type="bool" label="32104" default="false" />
</category>
- <category label="200">
- <setting id="movie_preset" type="enum" label="201" default="1"
lvalues="220|221|222" />
- <setting id="movie_speed" type="slider" subsetting="true"
visible="eq(-1,0)" label="202" default="100" range="0,100" />
- <setting id="movie_autospeed" type="slider" subsetting="true"
visible="eq(-2,0)" label="203" default="0" range="0,100" />
- <setting id="movie_interpolation" type="bool" subsetting="true"
visible="eq(-3,0)" label="204" default="false" />
- <setting id="movie_saturation" type="slider" subsetting="true"
visible="eq(-4,0)" label="205" option="float" default="0" range="0,0.1,20" />
- <setting id="movie_value" type="slider" subsetting="true"
visible="eq(-5,0)" label="206" option="float" default="0" range="0,0.1,20" />
- <setting id="movie_threshold" type="slider" subsetting="true"
visible="eq(-6,0)" label="207" default="0" range="0,255" />
+ <category label="32200">
+ <setting id="movie_preset" type="enum" label="32201" default="1"
lvalues="32220|32221|32222|32223" />
+ <setting id="movie_speed" type="slider" subsetting="true"
visible="eq(-1,0)" label="32202" default="100" range="0,100" />
+ <setting id="movie_autospeed" type="slider" subsetting="true"
visible="eq(-2,0)" label="32203" default="0" range="0,100" />
+ <setting id="movie_interpolation" type="bool" subsetting="true"
visible="eq(-3,0)" label="32204" default="false" />
+ <setting id="movie_saturation" type="slider" subsetting="true"
visible="eq(-4,0)" label="32205" option="float" default="0" range="0,0.1,20" />
+ <setting id="movie_value" type="slider" subsetting="true"
visible="eq(-5,0)" label="32206" option="float" default="0" range="0,0.1,20" />
+ <setting id="movie_threshold" type="slider" subsetting="true"
visible="eq(-6,0)" label="32207" default="0" range="0,255" />
</category>
- <category label="300">
- <setting id="musicvideo_preset" type="enum" label="201" default="1"
lvalues="320|321|322" />
- <setting id="musicvideo_speed" type="slider" subsetting="true"
visible="eq(-1,0)" label="202" default="100" range="0,100" />
- <setting id="musicvideo_autospeed" type="slider" subsetting="true"
visible="eq(-2,0)" label="203" default="0" range="0,100" />
- <setting id="musicvideo_interpolation" type="bool" subsetting="true"
visible="eq(-3,0)" label="204" default="false" />
- <setting id="musicvideo_saturation" type="slider" subsetting="true"
visible="eq(-4,0)" label="205" option="float" default="1" range="0,0.1,20" />
- <setting id="musicvideo_value" type="slider" subsetting="true"
visible="eq(-5,0)" label="206" option="float" default="1" range="0,0.1,20" />
- <setting id="musicvideo_threshold" type="slider" subsetting="true"
visible="eq(-6,0)" label="207" default="0" range="0,255" />
+ <category label="32600">
+ <setting id="tvshow_preset" type="enum" label="32201" default="1"
lvalues="32620|32621|32622|32623" />
+ <setting id="tvshow_speed" type="slider" subsetting="true"
visible="eq(-1,0)" label="32202" default="100" range="0,100" />
+ <setting id="tvshow_autospeed" type="slider" subsetting="true"
visible="eq(-2,0)" label="32203" default="0" range="0,100" />
+ <setting id="tvshow_interpolation" type="bool" subsetting="true"
visible="eq(-3,0)" label="32204" default="false" />
+ <setting id="tvshow_saturation" type="slider" subsetting="true"
visible="eq(-4,0)" label="32205" option="float" default="0" range="0,0.1,20" />
+ <setting id="tvshow_value" type="slider" subsetting="true"
visible="eq(-5,0)" label="32206" option="float" default="0" range="0,0.1,20" />
+ <setting id="tvshow_threshold" type="slider" subsetting="true"
visible="eq(-6,0)" label="32207" default="0" range="0,255" />
</category>
- <category label="400">
+ <category label="32700">
+ <setting id="livetv_preset" type="enum" label="32201" default="1"
lvalues="32720|32721|32722|32723" />
+ <setting id="livetv_speed" type="slider" subsetting="true"
visible="eq(-1,0)" label="32202" default="100" range="0,100" />
+ <setting id="livetv_autospeed" type="slider" subsetting="true"
visible="eq(-2,0)" label="32203" default="0" range="0,100" />
+ <setting id="livetv_interpolation" type="bool" subsetting="true"
visible="eq(-3,0)" label="32204" default="false" />
+ <setting id="livetv_saturation" type="slider" subsetting="true"
visible="eq(-4,0)" label="32205" option="float" default="0" range="0,0.1,20" />
+ <setting id="livetv_value" type="slider" subsetting="true"
visible="eq(-5,0)" label="32206" option="float" default="0" range="0,0.1,20" />
+ <setting id="livetv_threshold" type="slider" subsetting="true"
visible="eq(-6,0)" label="32207" default="0" range="0,255" />
+ </category>
+ <category label="32300">
+ <setting id="musicvideo_preset" type="enum" label="32201" default="1"
lvalues="32320|32321|32322|32323" />
+ <setting id="musicvideo_speed" type="slider" subsetting="true"
visible="eq(-1,0)" label="32202" default="100" range="0,100" />
+ <setting id="musicvideo_autospeed" type="slider" subsetting="true"
visible="eq(-2,0)" label="32203" default="0" range="0,100" />
+ <setting id="musicvideo_interpolation" type="bool" subsetting="true"
visible="eq(-3,0)" label="32204" default="false" />
+ <setting id="musicvideo_saturation" type="slider" subsetting="true"
visible="eq(-4,0)" label="32205" option="float" default="1" range="0,0.1,20" />
+ <setting id="musicvideo_value" type="slider" subsetting="true"
visible="eq(-5,0)" label="32206" option="float" default="1" range="0,0.1,20" />
+ <setting id="musicvideo_threshold" type="slider" subsetting="true"
visible="eq(-6,0)" label="32207" default="0" range="0,255" />
+ </category>
+ <category label="32800">
+ <setting id="files_preset" type="enum" label="32201" default="1"
lvalues="32820|32821|32822|32823" />
+ <setting id="files_speed" type="slider" subsetting="true"
visible="eq(-1,0)" label="32202" default="100" range="0,100" />
+ <setting id="files_autospeed" type="slider" subsetting="true"
visible="eq(-2,0)" label="32203" default="0" range="0,100" />
+ <setting id="files_interpolation" type="bool" subsetting="true"
visible="eq(-3,0)" label="32204" default="false" />
+ <setting id="files_saturation" type="slider" subsetting="true"
visible="eq(-4,0)" label="32205" option="float" default="0" range="0,0.1,20" />
+ <setting id="files_value" type="slider" subsetting="true"
visible="eq(-5,0)" label="32206" option="float" default="0" range="0,0.1,20" />
+ <setting id="files_threshold" type="slider" subsetting="true"
visible="eq(-6,0)" label="32207" default="0" range="0,255" />
+ </category>
+ <category label="32400">
<!-- uncomment these settings when boblight works on menu and non rendered
stuff too
- <setting id="other_speed" type="slider" label="202" default="100"
range="0,100" />
- <setting id="other_autospeed" type="slider" label="203" default="0"
range="0,100" />
- <setting id="other_interpolation" type="bool" label="204" default="false"
/>
- <setting id="other_saturation" type="slider" label="205" default="1"
option="float" range="0,0.1,20" />
- <setting id="other_value" type="slider" label="206" default="1"
option="float" range="0,0.1,20" />
- <setting id="other_threshold" type="slider" label="207" default="0"
range="0,255" />-->
- <setting id="other_static_bg" type="bool" label="401" default="false" />
- <setting id="other_static_red" type="slider" subsetting="true"
enable="eq(-1,true)" label="402" option="int" default="128" range="0,255" />
- <setting id="other_static_green" type="slider" subsetting="true"
enable="eq(-2,true)" label="403" option="int" default="128" range="0,255" />
- <setting id="other_static_blue" type="slider" subsetting="true"
enable="eq(-3,true)" label="404" option="int" default="128" range="0,255" />
- <setting id="other_static_onscreensaver" type="bool" label="405"
default="false" />
+ <setting id="other_speed" type="slider" label="32202" default="100"
range="0,100" />
+ <setting id="other_autospeed" type="slider" label="32203" default="0"
range="0,100" />
+ <setting id="other_interpolation" type="bool" label="32204"
default="false" />
+ <setting id="other_saturation" type="slider" label="32205" default="1"
option="float" range="0,0.1,20" />
+ <setting id="other_value" type="slider" label="32206" default="1"
option="float" range="0,0.1,20" />
+ <setting id="other_threshold" type="slider" label="32207" default="0"
range="0,255" />-->
+ <setting id="other_static_bg" type="bool" label="32401" default="false" />
+ <setting id="other_static_red" type="slider" subsetting="true"
enable="eq(-1,true)" label="32402" option="int" default="128" range="0,255" />
+ <setting id="other_static_green" type="slider" subsetting="true"
enable="eq(-2,true)" label="32403" option="int" default="128" range="0,255" />
+ <setting id="other_static_blue" type="slider" subsetting="true"
enable="eq(-3,true)" label="32404" option="int" default="128" range="0,255" />
+ <setting id="other_static_onscreensaver" type="bool" label="32405"
default="false" />
<setting id="sep3" type="sep" />
- <setting id="other_misc_initialflash" type="bool" label="406"
default="true" />
- <setting id="other_misc_notifications" type="bool" label="407"
default="true" />
+ <setting id="other_misc_initialflash" type="bool" label="32406"
default="true" />
+ <setting id="other_misc_notifications" type="bool" label="32407"
default="true" />
</category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.boblight/addon.xml | 7 +-
script.xbmc.boblight/changelog.txt | 10 +-
script.xbmc.boblight/default.py | 25 ++-
.../resources/language/Dutch/strings.xml | 86 +++++++++++
.../resources/language/English/strings.xml | 111 +++++++++------
.../resources/language/German/strings.xml | 111 +++++++++------
script.xbmc.boblight/resources/lib/settings.py | 155 +++++++++++++++++++-
script.xbmc.boblight/resources/lib/tools.py | 2 +-
script.xbmc.boblight/resources/settings.xml | 101 ++++++++-----
9 files changed, 470 insertions(+), 138 deletions(-)
create mode 100644 script.xbmc.boblight/resources/language/Dutch/strings.xml
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
