Author: agrundman
Date: Sat Sep 10 08:32:15 2011
New Revision: 9509
URL: http://svn.slimdevices.com/jive?rev=9509&view=rev
Log:
r79583@andy-imac (orig r9507): mherger | 2011-09-09 09:55:22 -0400
Bug: 15945
Description: force garbage collection when slideshow is running. Resizing
larger images might cause memory issues.
r79584@andy-imac (orig r9508): mherger | 2011-09-09 10:40:49 -0400
Bug: n/a
Description: bump TinySBS for GIF fix
Modified:
7.6/branches/usb-audio/ (props changed)
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
Propchange: 7.6/branches/usb-audio/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Sep 10 08:32:15 2011
@@ -15,7 +15,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9408
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9504
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9508
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
URL:
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb?rev=9509&r1=9508&r2=9509&view=diff
==============================================================================
---
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
(original)
+++
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
Sat Sep 10 08:32:15 2011
@@ -2,7 +2,7 @@
LICENSE = "GPL"
PV = "7.6+svnr${SRCREV}"
-PR = "r45"
+PR = "r46"
RDEPENDS += "perl perl-modules libcompress-raw-zlib-perl
libclass-xsaccessor-perl"
RDEPENDS += "libdbi-perl sqlite3 libdbd-sqlite-perl"
Modified:
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua?rev=9509&r1=9508&r2=9509&view=diff
==============================================================================
---
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
(original)
+++
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ImageViewer/ImageViewerApplet.lua
Sat Sep 10 08:32:15 2011
@@ -17,7 +17,7 @@
-- stuff we use
-local ipairs, tostring = ipairs, tostring
+local ipairs, tostring, collectgarbage = ipairs, tostring, collectgarbage
local os = require("os")
local oo = require("loop.simple")
@@ -867,7 +867,12 @@
end
)
+
log:debug("image rendering done")
+
+ -- free memory as quickly as possible - resizing large images might
have consumed a lot of it
+ collectgarbage("collect")
+
self.isRendering = false
self.task:removeTask()
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
