Author: mherger
Date: Fri Jan 9 05:38:39 2009
New Revision: 3747
URL: http://svn.slimdevices.com?rev=3747&root=Jive&view=rev
Log:
Bug: 10499
Description: fix song scanner's time format to use hours (hh::mm::ss) on SP
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3747&root=Jive&r1=3746&r2=3747&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Fri Jan 9 05:38:39 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.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua?rev=3747&root=Jive&r1=3746&r2=3747&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
Fri Jan 9 05:38:39 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)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
