Author: bklaas
Date: Mon Jul 7 09:45:31 2008
New Revision: 2669
URL: http://svn.slimdevices.com?rev=2669&root=Jive&view=rev
Log:
Bug: 6794
Description: do not delay between dropping black window on screen and dimming
the screen. If the screensaver was exited during that delay,
the screensaver would exit, then the screen dimming timer would fire and leave
the user with a non-exitable blank screen.
in SqueezeboxJive's getBrightness method, return stored brightness pref instead
of current self.lcdLevel setting
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua?rev=2669&root=Jive&r1=2668&r2=2669&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
Mon Jul 7 09:45:31 2008
@@ -47,6 +47,9 @@
self.bgicon = Icon("background", self.bg)
self.window:addWidget(self.bgicon)
+ -- store existing brightness levels in self
+ self.brightness = appletManager:callService("getBrightness")
+
-- register window as a screensaver
local manager = appletManager:getAppletInstance("ScreenSavers")
manager:screensaverWindow(self.window, true)
@@ -54,25 +57,16 @@
end
function closeScreensaver(self)
- _brightness(self.lcdLevel, self.keyLevel)
+ _brightness(self.brightness)
end
function openScreensaver(self, menuItem)
self.window:show(Window.transitionFadeIn)
-
- -- store existing brightness levels in self
- self.lcdLevel, self.keyLevel =
appletManager:callService("getBrightness")
-
- local lcdTimer = Timer(2000,
- function()
- _brightness(0, 0)
- end,
- true)
- lcdTimer:start()
+ _brightness(0)
end
-function _brightness(lcdLevel, keyLevel)
- appletManager:callService("setBrightness", lcdLevel, keyLevel)
+function _brightness(brightness)
+ appletManager:callService("setBrightness", brightness)
end
--[[
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=2669&root=Jive&r1=2668&r2=2669&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Mon Jul 7 09:45:31 2008
@@ -423,7 +423,8 @@
end
function getBrightness(self)
- return self.lcdLevel, self.keyLevel
+ local settings = self:getSettings()
+ return settings.brightness
end
function setBrightness(self, level)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
