Author: titmuss
Date: Sun Feb 10 03:03:57 2008
New Revision: 1880

URL: http://svn.slimdevices.com?rev=1880&root=Jive&view=rev
Log:
Bug: 6580
Description:
Make sure the screen is updated correctly when waking from sleep.


Modified:
    branches/7.0/jive/src/pkg/jive/src/ui/jive_framework.c
    
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua

Modified: branches/7.0/jive/src/pkg/jive/src/ui/jive_framework.c
URL: 
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/src/ui/jive_framework.c?rev=1880&root=Jive&r1=1879&r2=1880&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/src/ui/jive_framework.c (original)
+++ branches/7.0/jive/src/pkg/jive/src/ui/jive_framework.c Sun Feb 10 03:03:57 
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: 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL: 
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=1880&root=Jive&r1=1879&r2=1880&view=diff
==============================================================================
--- 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
 (original)
+++ 
branches/7.0/jive/src/pkg/jive_squeezeboxjive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
 Sun Feb 10 03:03:57 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

Reply via email to