Author: titmuss
Date: Tue Nov 18 04:05:08 2008
New Revision: 3397
URL: http://svn.slimdevices.com?rev=3397&root=Jive&view=rev
Log:
Bug: 9925
Description:
Clean up screensaver api.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua?rev=3397&root=Jive&r1=3396&r2=3397&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
Tue Nov 18 04:05:08 2008
@@ -64,9 +64,16 @@
true
)
+ self.window:addListener(
+ EVENT_MOTION,
+ function()
+ self.window:hide()
+ return EVENT_CONSUME
+ end)
+
-- register window as a screensaver
local manager = appletManager:getAppletInstance("ScreenSavers")
- manager:screensaverWindow(self.window, true)
+ manager:screensaverWindow(self.window)
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua?rev=3397&root=Jive&r1=3396&r2=3397&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua
Tue Nov 18 04:05:08 2008
@@ -124,9 +124,16 @@
obj.window = Window("Clock")
obj:_createSurface()
+ obj.window:addListener(
+ EVENT_MOTION,
+ function()
+ obj.window:hide()
+ return EVENT_CONSUME
+ end)
+
-- register window as a screensaver
local manager = appletManager:getAppletInstance("ScreenSavers")
- manager:screensaverWindow(obj.window, true)
+ manager:screensaverWindow(obj.window)
return obj
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=3397&root=Jive&r1=3396&r2=3397&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Tue Nov 18 04:05:08 2008
@@ -228,7 +228,7 @@
=cut
--]]
-function screensaverWindow(self, window, hideOnMotion)
+function screensaverWindow(self, window)
-- the screensaver is active when this window is pushed to the window
stack
window:addListener(EVENT_WINDOW_PUSH,
function(event)
@@ -251,16 +251,6 @@
log:debug("screensaver closed ",
#self.active)
return EVENT_UNUSED
end)
-
- if hideOnMotion then
- window:addListener(EVENT_MOTION,
- function(event)
- -- close all screensaver windows
- for i,w in ipairs(self.active) do
- _deactivate(self, w,
self.demoScreensaver)
- end
- end)
- end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
