Author: titmuss
Date: Sun Feb 10 16:32:30 2008
New Revision: 1891
URL: http://svn.slimdevices.com?rev=1891&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1880): titmuss | 2008-02-10 11:03:57 +0000
Bug: 6580
Description:
Make sure the screen is updated correctly when waking from sleep.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/src/ui/jive_framework.c
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Feb 10 16:32:30 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1874
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1880
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/src/ui/jive_framework.c?rev=1891&root=Jive&r1=1890&r2=1891&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/src/ui/jive_framework.c (original)
+++ trunk/jive/src/pkg/jive/src/ui/jive_framework.c Sun Feb 10 16:32:30 2008
@@ -325,7 +325,23 @@
* 2: enable/disable screen updates
*/
+ bool old_update_screen = update_screen;
update_screen = lua_toboolean(L, 2);
+
+ if (update_screen && !old_update_screen) {
+ /* cancel any pending transitions */
+ lua_pushnil(L);
+ lua_setfield(L, 1, "transition");
+
+ /* redraw now */
+ lua_pushcfunction(L, jiveL_update_screen);
+ lua_pushvalue(L, 1);
+ lua_call(L, 1, 0);
+
+ /* short delay to allow video buffer to flip */
+ SDL_Delay(50);
+ }
+
return 0;
}
Modified:
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=1891&root=Jive&r1=1890&r2=1891&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
trunk/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Sun Feb 10 16:32:30 2008
@@ -324,15 +324,11 @@
local settings = self:getSettings()
if lcdLevel ~= nil then
+ -- don't update the screen when the lcd is off
+ Framework:setUpdateScreen(lcdLevel ~= 0)
+
self.lcdLevel = lcdLevel
jiveBSP.ioctl(11, lcdLevel * 2048)
-
- -- don't update the screen when the lcd is off
- if lcdLevel == 0 then
- Framework:setUpdateScreen(false)
- else
- Framework:setUpdateScreen(true)
- end
end
if keyLevel ~= nil then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
