Author: titmuss
Date: Sat Jan 10 14:46:19 2009
New Revision: 3758
URL: http://svn.slimdevices.com?rev=3758&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3747): mherger | 2009-01-09 13:38:39 +0000
Bug: 10499
Description: fix song scanner's time format to use hours (hh::mm::ss) on SP
r3...@harrypotter (orig r3753): adrian | 2009-01-09 23:11:07 +0000
Bug: N/A
Description: avoid crashing if trying to load a non image file as an image
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_tile.c
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Jan 10 14:46:19 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3729
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3753
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.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3758&root=Jive&r1=3757&r2=3758&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Sat Jan 10 14:46:19 2009
@@ -802,9 +802,9 @@
s.scannerGroup.text = {}
s.scannerGroup.text.fg = TEXT_COLOR
s.scannerGroup.text.font = FONT_13px
- s.scannerGroup.text.w = 55
- -- s.scannerGroup.padding = { 0, 0, 0, 0 }
- s.scannerGroup.text.padding = { 8, 0, 0, 0}
+ s.scannerGroup.text.w = 60
+ s.scannerGroup.text.align = "right"
+ s.scannerGroup.text.padding = { 0, 0, 4, 0}
s.scannerPopup = {}
s.scannerPopup.x = 0
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua?rev=3758&root=Jive&r1=3757&r2=3758&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
Sat Jan 10 14:46:19 2009
@@ -48,10 +48,15 @@
module(..., oo.class)
local function _secondsToString(seconds)
- local min = math.floor(seconds / 60)
- local sec = math.floor(seconds - (min*60))
-
- return string.format("%d:%02d", min, sec)
+ local hrs = math.floor(seconds / 3600 )
+ local mins = math.floor((seconds % 3600) / 60)
+ local secs = seconds % 60
+
+ if hrs > 0 then
+ return string.format("%d:%02d:%02d", hrs, mins, secs)
+ end
+
+ return string.format("%d:%02d", mins, secs)
end
local function _updateDisplay(self)
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_tile.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_tile.c?rev=3758&root=Jive&r1=3757&r2=3758&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_tile.c (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_tile.c Sat Jan 10
14:46:19 2009
@@ -55,6 +55,9 @@
tmp = IMG_Load(fullpath);
if (!tmp) {
fprintf(stderr, "Error in jive_file_load_image: %s\n",
IMG_GetError());
+ free(fullpath);
+ free(tile);
+ return NULL;
}
else {
if (tmp->format->Amask) {
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
