Author: bklaas
Date: Wed Jul 2 12:56:29 2008
New Revision: 2657
URL: http://svn.slimdevices.com?rev=2657&root=Jive&view=rev
Log:
Bug: 6794
Description: use new registerService() and callService() to setBrightness to 0
and back again for "Screen Off" screensaver
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.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=2657&root=Jive&r1=2656&r2=2657&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
Wed Jul 2 12:56:29 2008
@@ -59,6 +59,10 @@
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)
@@ -68,22 +72,7 @@
end
function _brightness(lcdLevel, keyLevel)
-
- --[[ FIXME, don't use ioctl calls here,
- but instead register some brightness services from SqueezeboxJive and
use those
- this will be added when the SlimDiscovery refactoring work is merged in
-
- if lcdLevel ~= nil then
- -- don't update the screen when the lcd is off
- --Framework:setUpdateScreen(lcdLevel ~= 0)
- jiveBSP.ioctl(11, lcdLevel * 2048)
- end
-
- if keyLevel ~= nil then
- jiveBSP.ioctl(13, keyLevel * 512)
- end
- --]]
-
+ appletManager:callService("setBrightness", lcdLevel, keyLevel)
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=2657&root=Jive&r1=2656&r2=2657&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
Wed Jul 2 12:56:29 2008
@@ -420,6 +420,9 @@
self.fadeTimer:start()
end
+function getBrightness(self)
+ return self.lcdLevel, self.keyLevel
+end
function setBrightness(self, level)
local settings = self:getSettings()
Modified:
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua?rev=2657&root=Jive&r1=2656&r2=2657&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveMeta.lua
Wed Jul 2 12:56:29 2008
@@ -47,6 +47,9 @@
jiveMain:addItem(meta:menuItem('brightnessSetting', 'screenSettings',
"BSP_BRIGHTNESS", function(applet, ...) applet:settingsBrightnessShow(...) end))
jiveMain:addItem(meta:menuItem('powerDown', 'advancedSettings',
"POWER_DOWN", function(applet, ...) applet:settingsPowerDown(...) end))
jiveMain:addItem(meta:menuItem('suspendTest', 'factoryTest',
"POWER_MANAGEMENT_SETTINGS", function(applet, ...)
applet:settingsTestSuspend(...) end, _, { noCustom = 1 }))
+
+ meta:registerService("getBrightness")
+ meta:registerService("setBrightness")
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
