The branch, frodo has been updated
via 96530ce7c40521138196e4c24545e31568c15384 (commit)
from 9fc02e193f561cc40581215d0e09b5c734e5845e (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=96530ce7c40521138196e4c24545e31568c15384
commit 96530ce7c40521138196e4c24545e31568c15384
Author: unknown <[email protected]>
Date: Sat Apr 27 16:15:20 2013 +0200
[script.xbmc.boblight] 2.0.4
diff --git a/script.xbmc.boblight/addon.xml b/script.xbmc.boblight/addon.xml
index 030e832..65f60bf 100644
--- a/script.xbmc.boblight/addon.xml
+++ b/script.xbmc.boblight/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.xbmc.boblight" name="XBMC Boblight" version="2.0.3"
provider-name="bobo1on1, Memphiz">
+<addon id="script.xbmc.boblight" name="XBMC Boblight" version="2.0.4"
provider-name="bobo1on1|Memphiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
@@ -8,5 +8,9 @@
<summary lang="en">XBMC output to boblight.</summary>
<description lang="en">XBMC output to boblight
http://code.google.com/p/boblight/</description>
<platform>all</platform>
+ <website>http://code.google.com/p/boblight/</website>
+ <source>https://github.com/bobo1on1/script.xbmc.boblight</source>
+ <forum>http://forum.xbmc.org/showthread.php?tid=116331</forum>
+ <email></email>
</extension>
</addon>
diff --git a/script.xbmc.boblight/changelog.txt
b/script.xbmc.boblight/changelog.txt
index 13cc1f6..5a8efb5 100644
--- a/script.xbmc.boblight/changelog.txt
+++ b/script.xbmc.boblight/changelog.txt
@@ -1,3 +1,6 @@
+2.0.4
+- [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
- [add] - option for disabling/enabling any user notifications (connection
lost and so on)
diff --git a/script.xbmc.boblight/default.py b/script.xbmc.boblight/default.py
index 2e6a15f..3a6f282 100644
--- a/script.xbmc.boblight/default.py
+++ b/script.xbmc.boblight/default.py
@@ -46,16 +46,23 @@ settings = settings()
class MyPlayer( xbmc.Player ):
def __init__( self, *args, **kwargs ):
xbmc.Player.__init__( self )
+ self.playing = False
log('MyPlayer - init')
def onPlayBackStopped( self ):
+ self.playing = False
myPlayerChanged( 'stop' )
def onPlayBackEnded( self ):
+ self.playing = False
myPlayerChanged( 'stop' )
def onPlayBackStarted( self ):
+ self.playing = True
myPlayerChanged( 'start' )
+
+ def isPlaying( self ):
+ return self.playing
class MyMonitor( xbmc.Monitor ):
def __init__( self, *args, **kwargs ):
@@ -181,8 +188,7 @@ def run_boblight():
if not settings.staticBobActive:
capture.waitForCaptureStateChangeEvent(1000)
- if capture.getCaptureState() == xbmc.CAPTURE_STATE_DONE:
- bob.bob_set_priority(128)
+ if capture.getCaptureState() == xbmc.CAPTURE_STATE_DONE and
player_monitor.isPlaying():
width = capture.getWidth();
height = capture.getHeight();
pixels = capture.getImage();
@@ -195,7 +201,8 @@ def run_boblight():
rgb[1] = pixels[row + x * 4 + 1]
rgb[2] = pixels[row + x * 4]
bob.bob_addpixelxy(x, y, byref(rgb))
-
+
+ bob.bob_set_priority(128)
if not bob.bob_sendrgb():
log("error sending values: %s" % bob.bob_geterror())
return
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.boblight/addon.xml | 6 +++++-
script.xbmc.boblight/changelog.txt | 3 +++
script.xbmc.boblight/default.py | 13 ++++++++++---
3 files changed, 18 insertions(+), 4 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons